diff --git a/src/arguments/default/cls-decl-gen-meth-static.template b/src/arguments/default/cls-decl-gen-meth-static.template
index 29a505cd954c975142363ca8259c1cd95f3b1790..52a268b2826efaf86e723c25a9106f4dde17e73d 100644
--- a/src/arguments/default/cls-decl-gen-meth-static.template
+++ b/src/arguments/default/cls-decl-gen-meth-static.template
@@ -11,6 +11,7 @@ info: |
     Most ECMAScript functions make an arguments object available to their code. Depending upon the
     characteristics of the function definition, its arguments object is either an ordinary object
     or an arguments exotic object.
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/arguments/default/cls-decl-gen-meth.template b/src/arguments/default/cls-decl-gen-meth.template
index 3e7033e0b860328de9a7c662fb168ff090980e59..0406c21d889e51ce7346019c01fea0b27d16b28a 100644
--- a/src/arguments/default/cls-decl-gen-meth.template
+++ b/src/arguments/default/cls-decl-gen-meth.template
@@ -11,6 +11,7 @@ info: |
     Most ECMAScript functions make an arguments object available to their code. Depending upon the
     characteristics of the function definition, its arguments object is either an ordinary object
     or an arguments exotic object.
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/arguments/default/cls-expr-gen-meth-static.template b/src/arguments/default/cls-expr-gen-meth-static.template
index bf800123e14cad048b4f6131ab5e7cde8f4864fb..3649a008120475e43744967d7ee3be032492016e 100644
--- a/src/arguments/default/cls-expr-gen-meth-static.template
+++ b/src/arguments/default/cls-expr-gen-meth-static.template
@@ -11,6 +11,7 @@ info: |
     Most ECMAScript functions make an arguments object available to their code. Depending upon the
     characteristics of the function definition, its arguments object is either an ordinary object
     or an arguments exotic object.
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/arguments/default/cls-expr-gen-meth.template b/src/arguments/default/cls-expr-gen-meth.template
index 3f6cbe6ced763f495cd9e2a8a63d1cecd12a6c92..28073d5a198fedf7012189c8b1dff5b5f1a1c80d 100644
--- a/src/arguments/default/cls-expr-gen-meth.template
+++ b/src/arguments/default/cls-expr-gen-meth.template
@@ -11,6 +11,7 @@ info: |
     Most ECMAScript functions make an arguments object available to their code. Depending upon the
     characteristics of the function definition, its arguments object is either an ordinary object
     or an arguments exotic object.
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/arguments/default/gen-meth.template b/src/arguments/default/gen-meth.template
index 2919dae1ef9a04fd139ef45d2ae1757ae159eb0c..ecccfb117cebeeb06373a6696562f1bdc2deac50 100644
--- a/src/arguments/default/gen-meth.template
+++ b/src/arguments/default/gen-meth.template
@@ -11,6 +11,7 @@ info: |
     Most ECMAScript functions make an arguments object available to their code. Depending upon the
     characteristics of the function definition, its arguments object is either an ordinary object
     or an arguments exotic object.
+features: [generators]
 ---*/
 
 var callCount = 0;
diff --git a/src/class-fields/default/cls-decl-after-same-line-gen.template b/src/class-fields/default/cls-decl-after-same-line-gen.template
index 78e8d4b487252b2228ced05ae29f0c2592b7518d..876e0d8c5ac73990f24eea0408b0bbfac6d083fc 100644
--- a/src/class-fields/default/cls-decl-after-same-line-gen.template
+++ b/src/class-fields/default/cls-decl-after-same-line-gen.template
@@ -4,7 +4,7 @@
 /*---
 path: language/statements/class/fields-after-same-line-gen-
 name: field definitions after a generator in the same line
-features: [class-fields]
+features: [generators, class-fields]
 esid: prod-FieldDefinition
 ---*/
 
diff --git a/src/class-fields/default/cls-decl-after-same-line-static-gen.template b/src/class-fields/default/cls-decl-after-same-line-static-gen.template
index af4c1db027e5d178be36fe7b38368ffdd06e5028..d89d9975a28e5ccadef02803df51fd82c558cd49 100644
--- a/src/class-fields/default/cls-decl-after-same-line-static-gen.template
+++ b/src/class-fields/default/cls-decl-after-same-line-static-gen.template
@@ -4,7 +4,7 @@
 /*---
 path: language/statements/class/fields-after-same-line-static-gen-
 name: field definitions after a static generator in the same line
-features: [class-fields]
+features: [generators, class-fields]
 esid: prod-FieldDefinition
 ---*/
 
diff --git a/src/class-fields/default/cls-expr-after-same-line-gen.template b/src/class-fields/default/cls-expr-after-same-line-gen.template
index 9057ad6c1f578fee1f939ef008fbc175956a8d25..07e7a485d63892684a36e14b7bf5a38e23eb9fda 100644
--- a/src/class-fields/default/cls-expr-after-same-line-gen.template
+++ b/src/class-fields/default/cls-expr-after-same-line-gen.template
@@ -4,7 +4,7 @@
 /*---
 path: language/expressions/class/fields-after-same-line-gen-
 name: field definitions after a generator in the same line
-features: [class-fields]
+features: [generators, class-fields]
 esid: prod-FieldDefinition
 ---*/
 
diff --git a/src/class-fields/default/cls-expr-after-same-line-static-gen.template b/src/class-fields/default/cls-expr-after-same-line-static-gen.template
index a13b8ef5092a2e032360530751166c115bf6e91c..c64467527dc9946c26e50afc59101adb40ac5da5 100644
--- a/src/class-fields/default/cls-expr-after-same-line-static-gen.template
+++ b/src/class-fields/default/cls-expr-after-same-line-static-gen.template
@@ -4,7 +4,7 @@
 /*---
 path: language/expressions/class/fields-after-same-line-static-gen-
 name: field definitions after a static generator in the same line
-features: [class-fields]
+features: [generators, class-fields]
 esid: prod-FieldDefinition
 ---*/
 
diff --git a/src/function-forms/syntax/async-meth.template b/src/function-forms/syntax/async-meth.template
index 7200251a5c2a2f8fb0061933880d0a6f6d41e052..bec86025bf87e1a6a4289a4b86616c41920000b0 100644
--- a/src/function-forms/syntax/async-meth.template
+++ b/src/function-forms/syntax/async-meth.template
@@ -10,6 +10,7 @@ info: |
 
   AsyncMethod :
    async PropertyName ( UniqueFormalParameters ) { AsyncFunctionBody }
+features: [async-iteration]
 ---*/
 
 ({