diff --git a/src/gen/specialTags.ts b/src/gen/specialTags.ts
index 5ce8a39d..3ffb5b1e 100644
--- a/src/gen/specialTags.ts
+++ b/src/gen/specialTags.ts
@@ -47,9 +47,9 @@ export class SpecialTags {
 
   private extractTimeout() {
     for (const tag of this.ownTags.reverse()) {
-      const match = tag.match(/@timeout:(\d+)/i);
+      const match = tag.match(/@timeout:([\d_]+)/i);
       if (match) {
-        this.timeout = Number(match[1]);
+        this.timeout = Number(match[1].replace(/_/g, ''));
         return;
       }
     }
diff --git a/test/special-tags/features/timeout.feature b/test/special-tags/features/timeout.feature
index 09042a4b..240d48fb 100644
--- a/test/special-tags/features/timeout.feature
+++ b/test/special-tags/features/timeout.feature
@@ -5,7 +5,7 @@ Feature: timeout tag
   Scenario: scenario 1
     Given success step 1
 
-  @timeout:3000
+  @timeout:3_000
   Scenario Outline: scenario 2
     Given success step <start>