diff --git a/test/language/generators/generator.expression.implicit-name.js b/test/language/expressions/generators/implicit-name.js
similarity index 100%
rename from test/language/generators/generator.expression.implicit-name.js
rename to test/language/expressions/generators/implicit-name.js
diff --git a/test/language/generators/generator.expression.name.js b/test/language/expressions/generators/name.js
similarity index 100%
rename from test/language/generators/generator.expression.name.js
rename to test/language/expressions/generators/name.js
diff --git a/test/language/generators/generator.expression.no-name.js b/test/language/expressions/generators/no-name.js
similarity index 100%
rename from test/language/generators/generator.expression.no-name.js
rename to test/language/expressions/generators/no-name.js
diff --git a/test/language/generators/generator.declareMethod.argSuperCall.js b/test/language/method-definition/object/generators/argSuperCall.js
similarity index 100%
rename from test/language/generators/generator.declareMethod.argSuperCall.js
rename to test/language/method-definition/object/generators/argSuperCall.js
diff --git a/test/language/generators/generator.declareMethod.argSuperProperty.js b/test/language/method-definition/object/generators/argSuperProperty.js
similarity index 100%
rename from test/language/generators/generator.declareMethod.argSuperProperty.js
rename to test/language/method-definition/object/generators/argSuperProperty.js
diff --git a/test/language/generators/generator.declareMethod.bodySuperCall.js b/test/language/method-definition/object/generators/bodySuperCall.js
similarity index 100%
rename from test/language/generators/generator.declareMethod.bodySuperCall.js
rename to test/language/method-definition/object/generators/bodySuperCall.js
diff --git a/test/language/generators/generator.declareMethod.bodySuperProperty.js b/test/language/method-definition/object/generators/bodySuperProperty.js
similarity index 100%
rename from test/language/generators/generator.declareMethod.bodySuperProperty.js
rename to test/language/method-definition/object/generators/bodySuperProperty.js
diff --git a/test/language/generators/generator.declareMethod.shadow-parameter-const.js b/test/language/method-definition/object/generators/shadow-parameter-const.js
similarity index 100%
rename from test/language/generators/generator.declareMethod.shadow-parameter-const.js
rename to test/language/method-definition/object/generators/shadow-parameter-const.js
diff --git a/test/language/generators/generator.declareMethod.shadow-parameter-let.js b/test/language/method-definition/object/generators/shadow-parameter-let.js
similarity index 100%
rename from test/language/generators/generator.declareMethod.shadow-parameter-let.js
rename to test/language/method-definition/object/generators/shadow-parameter-let.js
diff --git a/test/language/generators/generator.declareMethod.js b/test/language/method-definition/object/generators/yield-return.js
similarity index 100%
rename from test/language/generators/generator.declareMethod.js
rename to test/language/method-definition/object/generators/yield-return.js
diff --git a/test/language/generators/generator.declaration.js b/test/language/statements/generators/declaration.js
similarity index 100%
rename from test/language/generators/generator.declaration.js
rename to test/language/statements/generators/declaration.js