From f8f5a7a1e7dae4e1a321bb7583f9043d35970c4f Mon Sep 17 00:00:00 2001
From: Leo Balter <leonardo.balter@gmail.com>
Date: Thu, 26 Oct 2017 17:05:18 -0400
Subject: [PATCH] Add missing generators flags

---
 .../built-ins/RegExp/RegExp-control-escape-russian-letter.js  | 1 +
 .../RegExp/RegExp-invalid-control-escape-character-class.js   | 1 +
 .../Function/prototype/toString/GeneratorFunction.js          | 1 +
 .../eval-code/direct/non-definable-global-generator.js        | 1 +
 test/language/expressions/await/await-in-generator.js         | 1 +
 test/language/expressions/await/await-in-nested-generator.js  | 1 +
 test/language/expressions/class/gen-method-length-dflt.js     | 2 +-
 .../expressions/class/params-dflt-gen-meth-args-unmapped.js   | 2 +-
 .../expressions/class/params-dflt-gen-meth-ref-arguments.js   | 2 +-
 .../class/params-dflt-gen-meth-static-args-unmapped.js        | 4 ++--
 .../class/params-dflt-gen-meth-static-ref-arguments.js        | 2 +-
 .../expressions/class/scope-gen-meth-paramsbody-var-close.js  | 1 +
 .../expressions/class/scope-gen-meth-paramsbody-var-open.js   | 1 +
 .../class/scope-static-gen-meth-paramsbody-var-close.js       | 1 +
 .../class/scope-static-gen-meth-paramsbody-var-open.js        | 1 +
 test/language/expressions/object/concise-generator.js         | 1 +
 .../object/method-definition/generator-length-dflt.js         | 2 +-
 .../generator-use-strict-with-non-simple-param.js             | 1 +
 .../method-definition/params-dflt-gen-meth-args-unmapped.js   | 4 ++--
 .../method-definition/params-dflt-gen-meth-ref-arguments.js   | 2 +-
 .../expressions/object/scope-gen-meth-body-lex-distinct.js    | 2 +-
 .../expressions/object/scope-gen-meth-param-elem-var-close.js | 1 +
 .../expressions/object/scope-gen-meth-param-elem-var-open.js  | 1 +
 .../object/scope-gen-meth-param-rest-elem-var-close.js        | 1 +
 .../object/scope-gen-meth-param-rest-elem-var-open.js         | 1 +
 .../expressions/object/scope-gen-meth-paramsbody-var-close.js | 1 +
 .../expressions/object/scope-gen-meth-paramsbody-var-open.js  | 1 +
 test/language/module-code/early-dup-export-decl.js            | 1 +
 test/language/module-code/eval-export-dflt-expr-gen-anon.js   | 1 +
 test/language/module-code/eval-export-dflt-expr-gen-named.js  | 1 +
 test/language/module-code/eval-export-dflt-gen-anon-semi.js   | 1 +
 test/language/module-code/eval-export-dflt-gen-named-semi.js  | 1 +
 test/language/module-code/eval-export-gen-semi.js             | 1 +
 test/language/module-code/instn-iee-bndng-gen.js              | 1 +
 test/language/module-code/instn-named-bndng-dflt-gen-anon.js  | 1 +
 test/language/module-code/instn-named-bndng-dflt-gen-named.js | 1 +
 test/language/module-code/instn-named-bndng-gen.js            | 1 +
 test/language/module-code/instn-uniq-env-rec.js               | 1 +
 .../parse-err-decl-pos-export-class-decl-method-gen-static.js | 1 +
 .../parse-err-decl-pos-export-class-decl-method-gen.js        | 1 +
 .../parse-err-decl-pos-export-class-expr-meth-gen-static.js   | 1 +
 .../parse-err-decl-pos-export-class-expr-meth-gen.js          | 1 +
 .../module-code/parse-err-decl-pos-export-generator-decl.js   | 1 +
 .../parse-err-decl-pos-export-object-gen-method.js            | 1 +
 .../parse-err-decl-pos-import-class-decl-method-gen-static.js | 1 +
 .../parse-err-decl-pos-import-class-decl-method-gen.js        | 1 +
 .../parse-err-decl-pos-import-class-expr-meth-gen-static.js   | 1 +
 .../parse-err-decl-pos-import-class-expr-meth-gen.js          | 1 +
 .../module-code/parse-err-decl-pos-import-generator-decl.js   | 1 +
 .../parse-err-decl-pos-import-object-gen-method.js            | 1 +
 test/language/module-code/parse-err-hoist-lex-gen.js          | 1 +
 test/language/module-code/parse-err-invoke-anon-gen-decl.js   | 1 +
 .../statements/class/definition/fn-name-static-precedence.js  | 1 +
 test/language/statements/class/gen-method-length-dflt.js      | 2 +-
 .../statements/class/params-dflt-gen-meth-args-unmapped.js    | 4 ++--
 .../statements/class/params-dflt-gen-meth-ref-arguments.js    | 2 +-
 .../class/params-dflt-gen-meth-static-args-unmapped.js        | 4 ++--
 .../class/params-dflt-gen-meth-static-ref-arguments.js        | 2 +-
 .../statements/class/scope-gen-meth-paramsbody-var-close.js   | 1 +
 .../statements/class/scope-gen-meth-paramsbody-var-open.js    | 1 +
 .../class/scope-static-gen-meth-paramsbody-var-close.js       | 1 +
 .../class/scope-static-gen-meth-paramsbody-var-open.js        | 1 +
 .../class/subclass/class-definition-superclass-generator.js   | 1 +
 ...ass-body-special-method-generator-contains-direct-super.js | 1 +
 ...lass-body-special-method-generator-propname-constructor.js | 1 +
 test/language/statements/do-while/decl-gen.js                 | 1 +
 test/language/statements/for-in/decl-gen.js                   | 1 +
 test/language/statements/for-of/decl-gen.js                   | 1 +
 test/language/statements/for-of/nested.js                     | 1 +
 test/language/statements/for/decl-gen.js                      | 1 +
 test/language/statements/if/if-gen-else-gen.js                | 1 +
 test/language/statements/if/if-gen-else-stmt.js               | 1 +
 test/language/statements/if/if-gen-no-else.js                 | 1 +
 test/language/statements/if/if-stmt-else-gen.js               | 1 +
 test/language/statements/labeled/decl-gen.js                  | 1 +
 .../let/syntax/let-newline-yield-in-generator-function.js     | 1 +
 test/language/statements/while/decl-gen.js                    | 1 +
 test/language/statements/with/decl-gen.js                     | 1 +
 78 files changed, 82 insertions(+), 18 deletions(-)

diff --git a/test/annexB/built-ins/RegExp/RegExp-control-escape-russian-letter.js b/test/annexB/built-ins/RegExp/RegExp-control-escape-russian-letter.js
index 7f0a145d5b..691094d7ff 100644
--- a/test/annexB/built-ins/RegExp/RegExp-control-escape-russian-letter.js
+++ b/test/annexB/built-ins/RegExp/RegExp-control-escape-russian-letter.js
@@ -8,6 +8,7 @@ es6id: B.1.4
 description: >
   "ControlLetter :: RUSSIAN ALPHABET is incorrect"
   Instead, fall back to semantics to match literal "\\c"
+features: [generators]
 ---*/
 
 function* invalidControls() {
diff --git a/test/annexB/built-ins/RegExp/RegExp-invalid-control-escape-character-class.js b/test/annexB/built-ins/RegExp/RegExp-invalid-control-escape-character-class.js
index 5ef9ccc870..d208a5fd18 100644
--- a/test/annexB/built-ins/RegExp/RegExp-invalid-control-escape-character-class.js
+++ b/test/annexB/built-ins/RegExp/RegExp-invalid-control-escape-character-class.js
@@ -10,6 +10,7 @@ info: >
 
   The production ClassAtomNoDash :: `\` evaluates as follows:
     1. Return the CharSet containing the single character `\`.
+features: [generators]
 ---*/
 
 function* invalidControls() {
diff --git a/test/built-ins/Function/prototype/toString/GeneratorFunction.js b/test/built-ins/Function/prototype/toString/GeneratorFunction.js
index 1ceaaed9f3..523f1cd2a7 100644
--- a/test/built-ins/Function/prototype/toString/GeneratorFunction.js
+++ b/test/built-ins/Function/prototype/toString/GeneratorFunction.js
@@ -4,6 +4,7 @@
 /*---
 esid: sec-createdynamicfunction
 description: Function.prototype.toString on a generator function created with the GeneratorFunction constructor
+features: [generators]
 ---*/
 
 let GeneratorFunction = Object.getPrototypeOf(function*(){}).constructor;
diff --git a/test/language/eval-code/direct/non-definable-global-generator.js b/test/language/eval-code/direct/non-definable-global-generator.js
index 519b965d4e..06f374f2d7 100644
--- a/test/language/eval-code/direct/non-definable-global-generator.js
+++ b/test/language/eval-code/direct/non-definable-global-generator.js
@@ -20,6 +20,7 @@ info: >
           c. If fnDefinable is false, throw TypeError exception.
         ...
 flags: [noStrict]
+features: [generators]
 ---*/
 
 var error;
diff --git a/test/language/expressions/await/await-in-generator.js b/test/language/expressions/await/await-in-generator.js
index 4fc9398cd9..5ccf59dc66 100644
--- a/test/language/expressions/await/await-in-generator.js
+++ b/test/language/expressions/await/await-in-generator.js
@@ -6,6 +6,7 @@ author: Brian Terlson <brian.terlson@microsoft.com>
 esid: pending
 description: >
   Await in a generator is an identifier
+features: [generators]
 ---*/
 
 function* foo(await) { yield await; };
diff --git a/test/language/expressions/await/await-in-nested-generator.js b/test/language/expressions/await/await-in-nested-generator.js
index 4e9268745f..b1164a55b8 100644
--- a/test/language/expressions/await/await-in-nested-generator.js
+++ b/test/language/expressions/await/await-in-nested-generator.js
@@ -6,6 +6,7 @@ author: Brian Terlson <brian.terlson@microsoft.com>
 esid: pending
 description: >
   Await is allowed as an identifier in generator functions nested in async functions
+features: [generators]
 ---*/
 
 var await;
diff --git a/test/language/expressions/class/gen-method-length-dflt.js b/test/language/expressions/class/gen-method-length-dflt.js
index 0de44b844c..bcc7506814 100644
--- a/test/language/expressions/class/gen-method-length-dflt.js
+++ b/test/language/expressions/class/gen-method-length-dflt.js
@@ -26,7 +26,7 @@ info: |
     2. If HasInitializer of FormalsList is true or HasInitializer of
     FormalParameter is true, return count.
     3. Return count+1.
-features: [default-parameters]
+features: [generators, default-parameters]
 includes: [propertyHelper.js]
 ---*/
 
diff --git a/test/language/expressions/class/params-dflt-gen-meth-args-unmapped.js b/test/language/expressions/class/params-dflt-gen-meth-args-unmapped.js
index d34478a773..f256b99771 100644
--- a/test/language/expressions/class/params-dflt-gen-meth-args-unmapped.js
+++ b/test/language/expressions/class/params-dflt-gen-meth-args-unmapped.js
@@ -4,7 +4,7 @@
 description: Referencing the arguments object from a default parameter (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
-features: [default-parameters]
+features: [generators, default-parameters]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
 
diff --git a/test/language/expressions/class/params-dflt-gen-meth-ref-arguments.js b/test/language/expressions/class/params-dflt-gen-meth-ref-arguments.js
index 880a9466a3..70253b0538 100644
--- a/test/language/expressions/class/params-dflt-gen-meth-ref-arguments.js
+++ b/test/language/expressions/class/params-dflt-gen-meth-ref-arguments.js
@@ -4,7 +4,7 @@
 description: Referencing the arguments object from a default parameter (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
-features: [default-parameters]
+features: [generators, default-parameters]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
 
diff --git a/test/language/expressions/class/params-dflt-gen-meth-static-args-unmapped.js b/test/language/expressions/class/params-dflt-gen-meth-static-args-unmapped.js
index 023b97c759..e52a63ffd0 100644
--- a/test/language/expressions/class/params-dflt-gen-meth-static-args-unmapped.js
+++ b/test/language/expressions/class/params-dflt-gen-meth-static-args-unmapped.js
@@ -4,7 +4,7 @@
 description: Referencing the arguments object from a default parameter (static class expression generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
-features: [default-parameters]
+features: [generators, default-parameters]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
 
@@ -67,7 +67,7 @@ info: |
        FormalsList using iteratorRecord and environment as the arguments.
     2. ReturnIfAbrupt(status).
     3. Return the result of performing IteratorBindingInitialization for
-       FormalParameter using iteratorRecord and environment as the arguments. 
+       FormalParameter using iteratorRecord and environment as the arguments.
 ---*/
 
 var callCount = 0;
diff --git a/test/language/expressions/class/params-dflt-gen-meth-static-ref-arguments.js b/test/language/expressions/class/params-dflt-gen-meth-static-ref-arguments.js
index 4cc5ed0b3b..20cf79c50e 100644
--- a/test/language/expressions/class/params-dflt-gen-meth-static-ref-arguments.js
+++ b/test/language/expressions/class/params-dflt-gen-meth-static-ref-arguments.js
@@ -4,7 +4,7 @@
 description: Referencing the arguments object from a default parameter (static class expression generator method)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
-features: [default-parameters]
+features: [generators, default-parameters]
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
 
diff --git a/test/language/expressions/class/scope-gen-meth-paramsbody-var-close.js b/test/language/expressions/class/scope-gen-meth-paramsbody-var-close.js
index d0f4280f8f..6ea5231333 100644
--- a/test/language/expressions/class/scope-gen-meth-paramsbody-var-close.js
+++ b/test/language/expressions/class/scope-gen-meth-paramsbody-var-close.js
@@ -17,6 +17,7 @@ info: |
         d. Set the VariableEnvironment of calleeContext to varEnv.
         e. Let instantiatedVarNames be a new empty List.
         [...]
+features: [generators]
 ---*/
 
 var probe;
diff --git a/test/language/expressions/class/scope-gen-meth-paramsbody-var-open.js b/test/language/expressions/class/scope-gen-meth-paramsbody-var-open.js
index 1b09a356e9..725024184b 100644
--- a/test/language/expressions/class/scope-gen-meth-paramsbody-var-open.js
+++ b/test/language/expressions/class/scope-gen-meth-paramsbody-var-open.js
@@ -18,6 +18,7 @@ info: |
         d. Set the VariableEnvironment of calleeContext to varEnv.
         e. Let instantiatedVarNames be a new empty List.
         [...]
+features: [generators]
 ---*/
 
 var x = 'outside';
diff --git a/test/language/expressions/class/scope-static-gen-meth-paramsbody-var-close.js b/test/language/expressions/class/scope-static-gen-meth-paramsbody-var-close.js
index 26ef25edc8..1f7b340f81 100644
--- a/test/language/expressions/class/scope-static-gen-meth-paramsbody-var-close.js
+++ b/test/language/expressions/class/scope-static-gen-meth-paramsbody-var-close.js
@@ -17,6 +17,7 @@ info: |
         d. Set the VariableEnvironment of calleeContext to varEnv.
         e. Let instantiatedVarNames be a new empty List.
         [...]
+features: [generators]
 ---*/
 
 var probe;
diff --git a/test/language/expressions/class/scope-static-gen-meth-paramsbody-var-open.js b/test/language/expressions/class/scope-static-gen-meth-paramsbody-var-open.js
index 17167c3ce4..151bd38931 100644
--- a/test/language/expressions/class/scope-static-gen-meth-paramsbody-var-open.js
+++ b/test/language/expressions/class/scope-static-gen-meth-paramsbody-var-open.js
@@ -18,6 +18,7 @@ info: |
         d. Set the VariableEnvironment of calleeContext to varEnv.
         e. Let instantiatedVarNames be a new empty List.
         [...]
+features: [generators]
 ---*/
 
 var x = 'outside';
diff --git a/test/language/expressions/object/concise-generator.js b/test/language/expressions/object/concise-generator.js
index 955fddf18e..27457cf0ad 100644
--- a/test/language/expressions/object/concise-generator.js
+++ b/test/language/expressions/object/concise-generator.js
@@ -4,6 +4,7 @@
 es6id: 12.2.5
 description: >
     super method calls in object literal concise generator
+features: [generators]
 ---*/
 var proto = {
   method() {
diff --git a/test/language/expressions/object/method-definition/generator-length-dflt.js b/test/language/expressions/object/method-definition/generator-length-dflt.js
index 97cfe97971..ab1e872aed 100644
--- a/test/language/expressions/object/method-definition/generator-length-dflt.js
+++ b/test/language/expressions/object/method-definition/generator-length-dflt.js
@@ -26,7 +26,7 @@ info: |
     2. If HasInitializer of FormalsList is true or HasInitializer of
     FormalParameter is true, return count.
     3. Return count+1.
-features: [default-parameters]
+features: [generators, default-parameters]
 includes: [propertyHelper.js]
 ---*/
 
diff --git a/test/language/expressions/object/method-definition/generator-use-strict-with-non-simple-param.js b/test/language/expressions/object/method-definition/generator-use-strict-with-non-simple-param.js
index 40890c001d..acb1932187 100644
--- a/test/language/expressions/object/method-definition/generator-use-strict-with-non-simple-param.js
+++ b/test/language/expressions/object/method-definition/generator-use-strict-with-non-simple-param.js
@@ -12,6 +12,7 @@ info: >
 negative:
   phase: early
   type: SyntaxError
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/expressions/object/method-definition/params-dflt-gen-meth-args-unmapped.js b/test/language/expressions/object/method-definition/params-dflt-gen-meth-args-unmapped.js
index 2705cc9770..9ab34ecba5 100644
--- a/test/language/expressions/object/method-definition/params-dflt-gen-meth-args-unmapped.js
+++ b/test/language/expressions/object/method-definition/params-dflt-gen-meth-args-unmapped.js
@@ -4,7 +4,7 @@
 description: Referencing the arguments object from a default parameter (generator method)
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
 es6id: 14.4.13
-features: [default-parameters]
+features: [generators, default-parameters]
 info: |
     GeneratorMethod :
         * PropertyName ( StrictFormalParameters ) { GeneratorBody }
@@ -49,7 +49,7 @@ info: |
        FormalsList using iteratorRecord and environment as the arguments.
     2. ReturnIfAbrupt(status).
     3. Return the result of performing IteratorBindingInitialization for
-       FormalParameter using iteratorRecord and environment as the arguments. 
+       FormalParameter using iteratorRecord and environment as the arguments.
 ---*/
 
 var callCount = 0;
diff --git a/test/language/expressions/object/method-definition/params-dflt-gen-meth-ref-arguments.js b/test/language/expressions/object/method-definition/params-dflt-gen-meth-ref-arguments.js
index acd31981c8..d416c18624 100644
--- a/test/language/expressions/object/method-definition/params-dflt-gen-meth-ref-arguments.js
+++ b/test/language/expressions/object/method-definition/params-dflt-gen-meth-ref-arguments.js
@@ -4,7 +4,7 @@
 description: Referencing the arguments object from a default parameter (generator method)
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
 es6id: 14.4.13
-features: [default-parameters]
+features: [generators, default-parameters]
 info: |
     GeneratorMethod :
         * PropertyName ( StrictFormalParameters ) { GeneratorBody }
diff --git a/test/language/expressions/object/scope-gen-meth-body-lex-distinct.js b/test/language/expressions/object/scope-gen-meth-body-lex-distinct.js
index 6ddc563132..14e4d9566a 100644
--- a/test/language/expressions/object/scope-gen-meth-body-lex-distinct.js
+++ b/test/language/expressions/object/scope-gen-meth-body-lex-distinct.js
@@ -40,7 +40,7 @@ info: |
                     like-named lexical declaration.
           iii. Let thisLex be thisLex's outer environment reference.
 flags: [noStrict]
-features: [let]
+features: [generators, let]
 ---*/
 
 var o = {
diff --git a/test/language/expressions/object/scope-gen-meth-param-elem-var-close.js b/test/language/expressions/object/scope-gen-meth-param-elem-var-close.js
index 3785b8fd1c..a9ea498651 100644
--- a/test/language/expressions/object/scope-gen-meth-param-elem-var-close.js
+++ b/test/language/expressions/object/scope-gen-meth-param-elem-var-close.js
@@ -15,6 +15,7 @@ info: |
     11. Set the LexicalEnvironment of currentContext to originalEnv.
     [...]
 flags: [noStrict]
+features: [generators]
 ---*/
 
 var x = 'outside';
diff --git a/test/language/expressions/object/scope-gen-meth-param-elem-var-open.js b/test/language/expressions/object/scope-gen-meth-param-elem-var-open.js
index 8ff970f766..bb9b6f17ab 100644
--- a/test/language/expressions/object/scope-gen-meth-param-elem-var-open.js
+++ b/test/language/expressions/object/scope-gen-meth-param-elem-var-open.js
@@ -16,6 +16,7 @@ info: |
     11. Set the LexicalEnvironment of currentContext to originalEnv.
     [...]
 flags: [noStrict]
+features: [generators]
 ---*/
 
 var x = 'outside';
diff --git a/test/language/expressions/object/scope-gen-meth-param-rest-elem-var-close.js b/test/language/expressions/object/scope-gen-meth-param-rest-elem-var-close.js
index b0d6ab104a..d8a6058849 100644
--- a/test/language/expressions/object/scope-gen-meth-param-rest-elem-var-close.js
+++ b/test/language/expressions/object/scope-gen-meth-param-rest-elem-var-close.js
@@ -21,6 +21,7 @@ info: |
     11. Set the LexicalEnvironment of currentContext to originalEnv.
     [...]
 flags: [noStrict]
+features: [generators]
 ---*/
 
 var x = 'outside';
diff --git a/test/language/expressions/object/scope-gen-meth-param-rest-elem-var-open.js b/test/language/expressions/object/scope-gen-meth-param-rest-elem-var-open.js
index dee21daa4c..43121e8859 100644
--- a/test/language/expressions/object/scope-gen-meth-param-rest-elem-var-open.js
+++ b/test/language/expressions/object/scope-gen-meth-param-rest-elem-var-open.js
@@ -21,6 +21,7 @@ info: |
     11. Set the LexicalEnvironment of currentContext to originalEnv.
     [...]
 flags: [noStrict]
+features: [generators]
 ---*/
 
 var x = 'outside';
diff --git a/test/language/expressions/object/scope-gen-meth-paramsbody-var-close.js b/test/language/expressions/object/scope-gen-meth-paramsbody-var-close.js
index 612ef84fdf..17f2cbe119 100644
--- a/test/language/expressions/object/scope-gen-meth-paramsbody-var-close.js
+++ b/test/language/expressions/object/scope-gen-meth-paramsbody-var-close.js
@@ -17,6 +17,7 @@ info: |
         d. Set the VariableEnvironment of calleeContext to varEnv.
         e. Let instantiatedVarNames be a new empty List.
         [...]
+features: [generators]
 ---*/
 
 var probe;
diff --git a/test/language/expressions/object/scope-gen-meth-paramsbody-var-open.js b/test/language/expressions/object/scope-gen-meth-paramsbody-var-open.js
index f3a1e4f9b0..18f19481c5 100644
--- a/test/language/expressions/object/scope-gen-meth-paramsbody-var-open.js
+++ b/test/language/expressions/object/scope-gen-meth-paramsbody-var-open.js
@@ -18,6 +18,7 @@ info: |
         d. Set the VariableEnvironment of calleeContext to varEnv.
         e. Let instantiatedVarNames be a new empty List.
         [...]
+features: [generators]
 ---*/
 
 var x = 'outside';
diff --git a/test/language/module-code/early-dup-export-decl.js b/test/language/module-code/early-dup-export-decl.js
index 5830b52c94..a938e6b576 100644
--- a/test/language/module-code/early-dup-export-decl.js
+++ b/test/language/module-code/early-dup-export-decl.js
@@ -9,6 +9,7 @@ flags: [module]
 negative:
   phase: early
   type: SyntaxError
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/module-code/eval-export-dflt-expr-gen-anon.js b/test/language/module-code/eval-export-dflt-expr-gen-anon.js
index 5b458012e2..670a0524c4 100644
--- a/test/language/module-code/eval-export-dflt-expr-gen-anon.js
+++ b/test/language/module-code/eval-export-dflt-expr-gen-anon.js
@@ -23,6 +23,7 @@ info: |
     5. Perform ? InitializeBoundName("*default*", value, env).
     [...]
 flags: [module]
+features: [generators]
 ---*/
 
 export default (function* () { return 24601; });
diff --git a/test/language/module-code/eval-export-dflt-expr-gen-named.js b/test/language/module-code/eval-export-dflt-expr-gen-named.js
index 16fb4bc910..388c10e250 100644
--- a/test/language/module-code/eval-export-dflt-expr-gen-named.js
+++ b/test/language/module-code/eval-export-dflt-expr-gen-named.js
@@ -23,6 +23,7 @@ info: |
     5. Perform ? InitializeBoundName("*default*", value, env).
     [...]
 flags: [module]
+features: [generators]
 ---*/
 
 export default (function* gName() { return 88; });
diff --git a/test/language/module-code/eval-export-dflt-gen-anon-semi.js b/test/language/module-code/eval-export-dflt-gen-anon-semi.js
index f5fb576bf9..ffa883ac52 100644
--- a/test/language/module-code/eval-export-dflt-gen-anon-semi.js
+++ b/test/language/module-code/eval-export-dflt-gen-anon-semi.js
@@ -6,6 +6,7 @@ description: >
     need to be terminated with a semicolon or newline
 esid: sec-moduleevaluation
 flags: [module]
+features: [generators]
 ---*/
 
 var count = 0;
diff --git a/test/language/module-code/eval-export-dflt-gen-named-semi.js b/test/language/module-code/eval-export-dflt-gen-named-semi.js
index deff1436ed..be0dfc7c19 100644
--- a/test/language/module-code/eval-export-dflt-gen-named-semi.js
+++ b/test/language/module-code/eval-export-dflt-gen-named-semi.js
@@ -6,6 +6,7 @@ description: >
     be terminated with a semicolon or newline
 esid: sec-moduleevaluation
 flags: [module]
+features: [generators]
 ---*/
 
 var count = 0;
diff --git a/test/language/module-code/eval-export-gen-semi.js b/test/language/module-code/eval-export-gen-semi.js
index 0152b14412..83a52d3f7e 100644
--- a/test/language/module-code/eval-export-gen-semi.js
+++ b/test/language/module-code/eval-export-gen-semi.js
@@ -6,6 +6,7 @@ description: >
     with a semicolon or newline
 esid: sec-moduleevaluation
 flags: [module]
+features: [generators]
 ---*/
 
 var count = 0;
diff --git a/test/language/module-code/instn-iee-bndng-gen.js b/test/language/module-code/instn-iee-bndng-gen.js
index c32331ef50..0df26bef7a 100644
--- a/test/language/module-code/instn-iee-bndng-gen.js
+++ b/test/language/module-code/instn-iee-bndng-gen.js
@@ -38,6 +38,7 @@ info: |
        and N2 as its target binding and record that the binding is initialized.
     6. Return NormalCompletion(empty).
 flags: [module]
+features: [generators]
 ---*/
 
 assert.sameValue(
diff --git a/test/language/module-code/instn-named-bndng-dflt-gen-anon.js b/test/language/module-code/instn-named-bndng-dflt-gen-anon.js
index e17ea4829b..6028c5f62d 100644
--- a/test/language/module-code/instn-named-bndng-dflt-gen-anon.js
+++ b/test/language/module-code/instn-named-bndng-dflt-gen-anon.js
@@ -43,6 +43,7 @@ info: |
          function * BindingIdentifier[?Yield] ( FormalParameters[Yield] ) { GeneratorBody }
          [+Default] function * ( FormalParameters[Yield] ) { GeneratorBody }
 flags: [module]
+features: [generators]
 ---*/
 
 assert.sameValue(g().next().value, 23, 'generator function value is hoisted');
diff --git a/test/language/module-code/instn-named-bndng-dflt-gen-named.js b/test/language/module-code/instn-named-bndng-dflt-gen-named.js
index 060f72c730..822526d746 100644
--- a/test/language/module-code/instn-named-bndng-dflt-gen-named.js
+++ b/test/language/module-code/instn-named-bndng-dflt-gen-named.js
@@ -43,6 +43,7 @@ info: |
          function * BindingIdentifier[?Yield] ( FormalParameters[Yield] ) { GeneratorBody }
          [+Default] function * ( FormalParameters[Yield] ) { GeneratorBody }
 flags: [module]
+features: [generators]
 ---*/
 
 assert.sameValue(g().next().value, 23, 'generator function value is hoisted');
diff --git a/test/language/module-code/instn-named-bndng-gen.js b/test/language/module-code/instn-named-bndng-gen.js
index 0917e664ac..ddefbc76f3 100644
--- a/test/language/module-code/instn-named-bndng-gen.js
+++ b/test/language/module-code/instn-named-bndng-gen.js
@@ -40,6 +40,7 @@ info: |
        and N2 as its target binding and record that the binding is initialized.
     6. Return NormalCompletion(empty).
 flags: [module]
+features: [generators]
 ---*/
 
 assert.sameValue(
diff --git a/test/language/module-code/instn-uniq-env-rec.js b/test/language/module-code/instn-uniq-env-rec.js
index 2c5628f04d..e49c9eec77 100644
--- a/test/language/module-code/instn-uniq-env-rec.js
+++ b/test/language/module-code/instn-uniq-env-rec.js
@@ -14,6 +14,7 @@ info: |
     1. Let env be a new Lexical Environment.
     [...]
 flags: [module]
+features: [generators]
 ---*/
 
 import './instn-uniq-env-rec-other_FIXTURE.js'
diff --git a/test/language/module-code/parse-err-decl-pos-export-class-decl-method-gen-static.js b/test/language/module-code/parse-err-decl-pos-export-class-decl-method-gen-static.js
index 6a4da69617..dad3211791 100644
--- a/test/language/module-code/parse-err-decl-pos-export-class-decl-method-gen-static.js
+++ b/test/language/module-code/parse-err-decl-pos-export-class-decl-method-gen-static.js
@@ -7,6 +7,7 @@ negative:
   phase: early
   type: SyntaxError
 flags: [module]
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/module-code/parse-err-decl-pos-export-class-decl-method-gen.js b/test/language/module-code/parse-err-decl-pos-export-class-decl-method-gen.js
index 239c6e95ba..f23428fa66 100644
--- a/test/language/module-code/parse-err-decl-pos-export-class-decl-method-gen.js
+++ b/test/language/module-code/parse-err-decl-pos-export-class-decl-method-gen.js
@@ -7,6 +7,7 @@ negative:
   phase: early
   type: SyntaxError
 flags: [module]
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/module-code/parse-err-decl-pos-export-class-expr-meth-gen-static.js b/test/language/module-code/parse-err-decl-pos-export-class-expr-meth-gen-static.js
index 4fe83ec7c4..f9987fb7d5 100644
--- a/test/language/module-code/parse-err-decl-pos-export-class-expr-meth-gen-static.js
+++ b/test/language/module-code/parse-err-decl-pos-export-class-expr-meth-gen-static.js
@@ -7,6 +7,7 @@ negative:
   phase: early
   type: SyntaxError
 flags: [module]
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/module-code/parse-err-decl-pos-export-class-expr-meth-gen.js b/test/language/module-code/parse-err-decl-pos-export-class-expr-meth-gen.js
index 5c03492448..a367b60887 100644
--- a/test/language/module-code/parse-err-decl-pos-export-class-expr-meth-gen.js
+++ b/test/language/module-code/parse-err-decl-pos-export-class-expr-meth-gen.js
@@ -7,6 +7,7 @@ negative:
   phase: early
   type: SyntaxError
 flags: [module]
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/module-code/parse-err-decl-pos-export-generator-decl.js b/test/language/module-code/parse-err-decl-pos-export-generator-decl.js
index 34035d2d67..d42c0f796c 100644
--- a/test/language/module-code/parse-err-decl-pos-export-generator-decl.js
+++ b/test/language/module-code/parse-err-decl-pos-export-generator-decl.js
@@ -7,6 +7,7 @@ negative:
   phase: early
   type: SyntaxError
 flags: [module]
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/module-code/parse-err-decl-pos-export-object-gen-method.js b/test/language/module-code/parse-err-decl-pos-export-object-gen-method.js
index 304b5a80b6..6a2b6364e7 100644
--- a/test/language/module-code/parse-err-decl-pos-export-object-gen-method.js
+++ b/test/language/module-code/parse-err-decl-pos-export-object-gen-method.js
@@ -7,6 +7,7 @@ negative:
   phase: early
   type: SyntaxError
 flags: [module]
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/module-code/parse-err-decl-pos-import-class-decl-method-gen-static.js b/test/language/module-code/parse-err-decl-pos-import-class-decl-method-gen-static.js
index 7659a1b377..f79daa9c1a 100644
--- a/test/language/module-code/parse-err-decl-pos-import-class-decl-method-gen-static.js
+++ b/test/language/module-code/parse-err-decl-pos-import-class-decl-method-gen-static.js
@@ -7,6 +7,7 @@ negative:
   phase: early
   type: SyntaxError
 flags: [module]
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/module-code/parse-err-decl-pos-import-class-decl-method-gen.js b/test/language/module-code/parse-err-decl-pos-import-class-decl-method-gen.js
index 288c42fec6..bb74bf0d2b 100644
--- a/test/language/module-code/parse-err-decl-pos-import-class-decl-method-gen.js
+++ b/test/language/module-code/parse-err-decl-pos-import-class-decl-method-gen.js
@@ -7,6 +7,7 @@ negative:
   phase: early
   type: SyntaxError
 flags: [module]
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/module-code/parse-err-decl-pos-import-class-expr-meth-gen-static.js b/test/language/module-code/parse-err-decl-pos-import-class-expr-meth-gen-static.js
index f6ee7837f6..82ef380c19 100644
--- a/test/language/module-code/parse-err-decl-pos-import-class-expr-meth-gen-static.js
+++ b/test/language/module-code/parse-err-decl-pos-import-class-expr-meth-gen-static.js
@@ -7,6 +7,7 @@ negative:
   phase: early
   type: SyntaxError
 flags: [module]
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/module-code/parse-err-decl-pos-import-class-expr-meth-gen.js b/test/language/module-code/parse-err-decl-pos-import-class-expr-meth-gen.js
index fe4911da59..dc623d4a61 100644
--- a/test/language/module-code/parse-err-decl-pos-import-class-expr-meth-gen.js
+++ b/test/language/module-code/parse-err-decl-pos-import-class-expr-meth-gen.js
@@ -7,6 +7,7 @@ negative:
   phase: early
   type: SyntaxError
 flags: [module]
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/module-code/parse-err-decl-pos-import-generator-decl.js b/test/language/module-code/parse-err-decl-pos-import-generator-decl.js
index e0dea3ba9c..106dc38bc6 100644
--- a/test/language/module-code/parse-err-decl-pos-import-generator-decl.js
+++ b/test/language/module-code/parse-err-decl-pos-import-generator-decl.js
@@ -7,6 +7,7 @@ negative:
   phase: early
   type: SyntaxError
 flags: [module]
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/module-code/parse-err-decl-pos-import-object-gen-method.js b/test/language/module-code/parse-err-decl-pos-import-object-gen-method.js
index 39c3cb7726..52eec77f83 100644
--- a/test/language/module-code/parse-err-decl-pos-import-object-gen-method.js
+++ b/test/language/module-code/parse-err-decl-pos-import-object-gen-method.js
@@ -7,6 +7,7 @@ negative:
   phase: early
   type: SyntaxError
 flags: [module]
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/module-code/parse-err-hoist-lex-gen.js b/test/language/module-code/parse-err-hoist-lex-gen.js
index a68a31adf0..6eaa8fc8ee 100644
--- a/test/language/module-code/parse-err-hoist-lex-gen.js
+++ b/test/language/module-code/parse-err-hoist-lex-gen.js
@@ -18,6 +18,7 @@ negative:
   phase: early
   type: SyntaxError
 flags: [module]
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/module-code/parse-err-invoke-anon-gen-decl.js b/test/language/module-code/parse-err-invoke-anon-gen-decl.js
index 16eeb6a084..34eb165783 100644
--- a/test/language/module-code/parse-err-invoke-anon-gen-decl.js
+++ b/test/language/module-code/parse-err-invoke-anon-gen-decl.js
@@ -19,6 +19,7 @@ negative:
   phase: early
   type: SyntaxError
 flags: [module]
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/statements/class/definition/fn-name-static-precedence.js b/test/language/statements/class/definition/fn-name-static-precedence.js
index 6955bbbbb1..0a3971e533 100644
--- a/test/language/statements/class/definition/fn-name-static-precedence.js
+++ b/test/language/statements/class/definition/fn-name-static-precedence.js
@@ -14,6 +14,7 @@ info: >
     6. If hasNameProperty is false, then perform SetFunctionName(value,
        className).
 includes: [propertyHelper.js]
+features: [generators]
 ---*/
 
 class A {
diff --git a/test/language/statements/class/gen-method-length-dflt.js b/test/language/statements/class/gen-method-length-dflt.js
index a26a287fe7..733f569a25 100644
--- a/test/language/statements/class/gen-method-length-dflt.js
+++ b/test/language/statements/class/gen-method-length-dflt.js
@@ -26,7 +26,7 @@ info: |
     2. If HasInitializer of FormalsList is true or HasInitializer of
     FormalParameter is true, return count.
     3. Return count+1.
-features: [default-parameters]
+features: [generators, default-parameters]
 includes: [propertyHelper.js]
 ---*/
 
diff --git a/test/language/statements/class/params-dflt-gen-meth-args-unmapped.js b/test/language/statements/class/params-dflt-gen-meth-args-unmapped.js
index 0c854d66b6..4685849ff8 100644
--- a/test/language/statements/class/params-dflt-gen-meth-args-unmapped.js
+++ b/test/language/statements/class/params-dflt-gen-meth-args-unmapped.js
@@ -4,7 +4,7 @@
 description: Referencing the arguments object from a default parameter (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
-features: [default-parameters]
+features: [generators, default-parameters]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
 
@@ -65,7 +65,7 @@ info: |
        FormalsList using iteratorRecord and environment as the arguments.
     2. ReturnIfAbrupt(status).
     3. Return the result of performing IteratorBindingInitialization for
-       FormalParameter using iteratorRecord and environment as the arguments. 
+       FormalParameter using iteratorRecord and environment as the arguments.
 ---*/
 
 var callCount = 0;
diff --git a/test/language/statements/class/params-dflt-gen-meth-ref-arguments.js b/test/language/statements/class/params-dflt-gen-meth-ref-arguments.js
index 97b5773cbb..774452c7e1 100644
--- a/test/language/statements/class/params-dflt-gen-meth-ref-arguments.js
+++ b/test/language/statements/class/params-dflt-gen-meth-ref-arguments.js
@@ -4,7 +4,7 @@
 description: Referencing the arguments object from a default parameter (class expression method)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
-features: [default-parameters]
+features: [generators, default-parameters]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
 
diff --git a/test/language/statements/class/params-dflt-gen-meth-static-args-unmapped.js b/test/language/statements/class/params-dflt-gen-meth-static-args-unmapped.js
index 554565f338..ba12ca2d4d 100644
--- a/test/language/statements/class/params-dflt-gen-meth-static-args-unmapped.js
+++ b/test/language/statements/class/params-dflt-gen-meth-static-args-unmapped.js
@@ -4,7 +4,7 @@
 description: Referencing the arguments object from a default parameter (static class expression generator method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
-features: [default-parameters]
+features: [generators, default-parameters]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
 
@@ -65,7 +65,7 @@ info: |
        FormalsList using iteratorRecord and environment as the arguments.
     2. ReturnIfAbrupt(status).
     3. Return the result of performing IteratorBindingInitialization for
-       FormalParameter using iteratorRecord and environment as the arguments. 
+       FormalParameter using iteratorRecord and environment as the arguments.
 ---*/
 
 var callCount = 0;
diff --git a/test/language/statements/class/params-dflt-gen-meth-static-ref-arguments.js b/test/language/statements/class/params-dflt-gen-meth-static-ref-arguments.js
index 9ac26245c4..407be2cd3b 100644
--- a/test/language/statements/class/params-dflt-gen-meth-static-ref-arguments.js
+++ b/test/language/statements/class/params-dflt-gen-meth-static-ref-arguments.js
@@ -4,7 +4,7 @@
 description: Referencing the arguments object from a default parameter (static class expression generator method)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
-features: [default-parameters]
+features: [generators, default-parameters]
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
 
diff --git a/test/language/statements/class/scope-gen-meth-paramsbody-var-close.js b/test/language/statements/class/scope-gen-meth-paramsbody-var-close.js
index e05a47fcd2..0a74b79e95 100644
--- a/test/language/statements/class/scope-gen-meth-paramsbody-var-close.js
+++ b/test/language/statements/class/scope-gen-meth-paramsbody-var-close.js
@@ -17,6 +17,7 @@ info: |
         d. Set the VariableEnvironment of calleeContext to varEnv.
         e. Let instantiatedVarNames be a new empty List.
         [...]
+features: [generators]
 ---*/
 
 var probe;
diff --git a/test/language/statements/class/scope-gen-meth-paramsbody-var-open.js b/test/language/statements/class/scope-gen-meth-paramsbody-var-open.js
index ae60bf59ba..823b79f99e 100644
--- a/test/language/statements/class/scope-gen-meth-paramsbody-var-open.js
+++ b/test/language/statements/class/scope-gen-meth-paramsbody-var-open.js
@@ -18,6 +18,7 @@ info: |
         d. Set the VariableEnvironment of calleeContext to varEnv.
         e. Let instantiatedVarNames be a new empty List.
         [...]
+features: [generators]
 ---*/
 
 var x = 'outside';
diff --git a/test/language/statements/class/scope-static-gen-meth-paramsbody-var-close.js b/test/language/statements/class/scope-static-gen-meth-paramsbody-var-close.js
index e830855773..334f308946 100644
--- a/test/language/statements/class/scope-static-gen-meth-paramsbody-var-close.js
+++ b/test/language/statements/class/scope-static-gen-meth-paramsbody-var-close.js
@@ -17,6 +17,7 @@ info: |
         d. Set the VariableEnvironment of calleeContext to varEnv.
         e. Let instantiatedVarNames be a new empty List.
         [...]
+features: [generators]
 ---*/
 
 var probe;
diff --git a/test/language/statements/class/scope-static-gen-meth-paramsbody-var-open.js b/test/language/statements/class/scope-static-gen-meth-paramsbody-var-open.js
index 8ffba8b382..2f16a4587f 100644
--- a/test/language/statements/class/scope-static-gen-meth-paramsbody-var-open.js
+++ b/test/language/statements/class/scope-static-gen-meth-paramsbody-var-open.js
@@ -18,6 +18,7 @@ info: |
         d. Set the VariableEnvironment of calleeContext to varEnv.
         e. Let instantiatedVarNames be a new empty List.
         [...]
+features: [generators]
 ---*/
 
 var x = 'outside';
diff --git a/test/language/statements/class/subclass/class-definition-superclass-generator.js b/test/language/statements/class/subclass/class-definition-superclass-generator.js
index 966bf33022..e9f9271878 100644
--- a/test/language/statements/class/subclass/class-definition-superclass-generator.js
+++ b/test/language/statements/class/subclass/class-definition-superclass-generator.js
@@ -6,6 +6,7 @@ description: >
     Runtime Semantics: ClassDefinitionEvaluation
 
     If superclass has a [[FunctionKind]] internal slot whose value is "generator", throw a TypeError exception.
+features: [generators]
 ---*/
 function * G() {}
 
diff --git a/test/language/statements/class/syntax/early-errors/class-body-special-method-generator-contains-direct-super.js b/test/language/statements/class/syntax/early-errors/class-body-special-method-generator-contains-direct-super.js
index c6b0e3abf5..e1c9b7f504 100644
--- a/test/language/statements/class/syntax/early-errors/class-body-special-method-generator-contains-direct-super.js
+++ b/test/language/statements/class/syntax/early-errors/class-body-special-method-generator-contains-direct-super.js
@@ -12,6 +12,7 @@ description: >
 negative:
   phase: early
   type: SyntaxError
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/statements/class/syntax/early-errors/class-body-special-method-generator-propname-constructor.js b/test/language/statements/class/syntax/early-errors/class-body-special-method-generator-propname-constructor.js
index 99adf2761f..cbd1eb9281 100644
--- a/test/language/statements/class/syntax/early-errors/class-body-special-method-generator-propname-constructor.js
+++ b/test/language/statements/class/syntax/early-errors/class-body-special-method-generator-propname-constructor.js
@@ -12,6 +12,7 @@ description: >
 negative:
   phase: early
   type: SyntaxError
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/statements/do-while/decl-gen.js b/test/language/statements/do-while/decl-gen.js
index c4b7bf2fc5..dd3d3ca7b1 100644
--- a/test/language/statements/do-while/decl-gen.js
+++ b/test/language/statements/do-while/decl-gen.js
@@ -7,6 +7,7 @@ es6id: 13.7.2
 negative:
   phase: early
   type: SyntaxError
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/statements/for-in/decl-gen.js b/test/language/statements/for-in/decl-gen.js
index 3ec1608328..8622f630d6 100644
--- a/test/language/statements/for-in/decl-gen.js
+++ b/test/language/statements/for-in/decl-gen.js
@@ -7,6 +7,7 @@ es6id: 13.7.5
 negative:
   phase: early
   type: SyntaxError
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/statements/for-of/decl-gen.js b/test/language/statements/for-of/decl-gen.js
index 384ac5b2fb..6a40538f5c 100644
--- a/test/language/statements/for-of/decl-gen.js
+++ b/test/language/statements/for-of/decl-gen.js
@@ -7,6 +7,7 @@ es6id: 13.7.5
 negative:
   phase: early
   type: SyntaxError
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/statements/for-of/nested.js b/test/language/statements/for-of/nested.js
index cd1f4bc976..36cf82fe4c 100644
--- a/test/language/statements/for-of/nested.js
+++ b/test/language/statements/for-of/nested.js
@@ -4,6 +4,7 @@
 es6id: 13.6.4.13
 description: >
     Nested statements should operate independently.
+features: [generators]
 ---*/
 
 function* values() {
diff --git a/test/language/statements/for/decl-gen.js b/test/language/statements/for/decl-gen.js
index 5d6fcb954e..52c4ac7a66 100644
--- a/test/language/statements/for/decl-gen.js
+++ b/test/language/statements/for/decl-gen.js
@@ -7,6 +7,7 @@ es6id: 13.7.4
 negative:
   phase: early
   type: SyntaxError
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/statements/if/if-gen-else-gen.js b/test/language/statements/if/if-gen-else-gen.js
index cddfbec310..f4118fa42d 100644
--- a/test/language/statements/if/if-gen-else-gen.js
+++ b/test/language/statements/if/if-gen-else-gen.js
@@ -7,6 +7,7 @@ es6id: 13.6
 negative:
   phase: early
   type: SyntaxError
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/statements/if/if-gen-else-stmt.js b/test/language/statements/if/if-gen-else-stmt.js
index e33e3ca8e2..1b5a11c5e2 100644
--- a/test/language/statements/if/if-gen-else-stmt.js
+++ b/test/language/statements/if/if-gen-else-stmt.js
@@ -7,6 +7,7 @@ es6id: 13.6
 negative:
   phase: early
   type: SyntaxError
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/statements/if/if-gen-no-else.js b/test/language/statements/if/if-gen-no-else.js
index 52d8402cd4..f89f3afb43 100644
--- a/test/language/statements/if/if-gen-no-else.js
+++ b/test/language/statements/if/if-gen-no-else.js
@@ -7,6 +7,7 @@ es6id: 13.6
 negative:
   phase: early
   type: SyntaxError
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/statements/if/if-stmt-else-gen.js b/test/language/statements/if/if-stmt-else-gen.js
index c4911f8695..8cd38a4172 100644
--- a/test/language/statements/if/if-stmt-else-gen.js
+++ b/test/language/statements/if/if-stmt-else-gen.js
@@ -7,6 +7,7 @@ es6id: 13.6
 negative:
   phase: early
   type: SyntaxError
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/statements/labeled/decl-gen.js b/test/language/statements/labeled/decl-gen.js
index 78deada41c..5cc26f17f9 100644
--- a/test/language/statements/labeled/decl-gen.js
+++ b/test/language/statements/labeled/decl-gen.js
@@ -7,6 +7,7 @@ es6id: 13.13
 negative:
   phase: early
   type: SyntaxError
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/statements/let/syntax/let-newline-yield-in-generator-function.js b/test/language/statements/let/syntax/let-newline-yield-in-generator-function.js
index c5fe8fb14d..4ba3a39a44 100644
--- a/test/language/statements/let/syntax/let-newline-yield-in-generator-function.js
+++ b/test/language/statements/let/syntax/let-newline-yield-in-generator-function.js
@@ -14,6 +14,7 @@ info: >
 negative:
   phase: early
   type: SyntaxError
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/statements/while/decl-gen.js b/test/language/statements/while/decl-gen.js
index 4ff362ce33..3e677e6a45 100644
--- a/test/language/statements/while/decl-gen.js
+++ b/test/language/statements/while/decl-gen.js
@@ -7,6 +7,7 @@ es6id: 13.7.3
 negative:
   phase: early
   type: SyntaxError
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";
diff --git a/test/language/statements/with/decl-gen.js b/test/language/statements/with/decl-gen.js
index 3560d3c65a..20350cfb57 100644
--- a/test/language/statements/with/decl-gen.js
+++ b/test/language/statements/with/decl-gen.js
@@ -8,6 +8,7 @@ flags: [noStrict]
 negative:
   phase: early
   type: SyntaxError
+features: [generators]
 ---*/
 
 throw "Test262: This statement should not be evaluated.";