diff --git a/test/esnext.js b/test/esnext.js
new file mode 100644
index 0000000000..7c8d38dd5c
--- /dev/null
+++ b/test/esnext.js
@@ -0,0 +1,3 @@
+require("./_transformation-helper")({
+  name: "esnext"
+});
diff --git a/test/fixtures/transformation/esnext-es6-arrow-functions/arguments-refers-to-parent-function.js b/test/fixtures/esnext/es6-arrow-functions/arguments-refers-to-parent-function.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-arrow-functions/arguments-refers-to-parent-function.js
rename to test/fixtures/esnext/es6-arrow-functions/arguments-refers-to-parent-function.js
diff --git a/test/fixtures/transformation/esnext-es6-arrow-functions/does-not-bind-this-from-standard-function.js b/test/fixtures/esnext/es6-arrow-functions/does-not-bind-this-from-standard-function.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-arrow-functions/does-not-bind-this-from-standard-function.js
rename to test/fixtures/esnext/es6-arrow-functions/does-not-bind-this-from-standard-function.js
diff --git a/test/fixtures/transformation/esnext-es6-arrow-functions/empty-arrow-function.js b/test/fixtures/esnext/es6-arrow-functions/empty-arrow-function.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-arrow-functions/empty-arrow-function.js
rename to test/fixtures/esnext/es6-arrow-functions/empty-arrow-function.js
diff --git a/test/fixtures/transformation/esnext-es6-arrow-functions/handles-nested-context-bindings.js b/test/fixtures/esnext/es6-arrow-functions/handles-nested-context-bindings.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-arrow-functions/handles-nested-context-bindings.js
rename to test/fixtures/esnext/es6-arrow-functions/handles-nested-context-bindings.js
diff --git a/test/fixtures/transformation/esnext-es6-arrow-functions/no-parens-for-low-precedence-expression-body.js b/test/fixtures/esnext/es6-arrow-functions/no-parens-for-low-precedence-expression-body.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-arrow-functions/no-parens-for-low-precedence-expression-body.js
rename to test/fixtures/esnext/es6-arrow-functions/no-parens-for-low-precedence-expression-body.js
diff --git a/test/fixtures/transformation/esnext-es6-arrow-functions/object-literal-needs-parens.js b/test/fixtures/esnext/es6-arrow-functions/object-literal-needs-parens.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-arrow-functions/object-literal-needs-parens.js
rename to test/fixtures/esnext/es6-arrow-functions/object-literal-needs-parens.js
diff --git a/test/fixtures/transformation/esnext-es6-arrow-functions/only-lexical-this-not-dynamic-this.js b/test/fixtures/esnext/es6-arrow-functions/only-lexical-this-not-dynamic-this.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-arrow-functions/only-lexical-this-not-dynamic-this.js
rename to test/fixtures/esnext/es6-arrow-functions/only-lexical-this-not-dynamic-this.js
diff --git a/test/fixtures/transformation/esnext-es6-arrow-functions/passed-to-function.js b/test/fixtures/esnext/es6-arrow-functions/passed-to-function.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-arrow-functions/passed-to-function.js
rename to test/fixtures/esnext/es6-arrow-functions/passed-to-function.js
diff --git a/test/fixtures/transformation/esnext-es6-arrow-functions/single-param-does-not-need-parens.js b/test/fixtures/esnext/es6-arrow-functions/single-param-does-not-need-parens.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-arrow-functions/single-param-does-not-need-parens.js
rename to test/fixtures/esnext/es6-arrow-functions/single-param-does-not-need-parens.js
diff --git a/test/fixtures/transformation/esnext-es6-classes/anonymous-class.js b/test/fixtures/esnext/es6-classes/anonymous-class.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-classes/anonymous-class.js
rename to test/fixtures/esnext/es6-classes/anonymous-class.js
diff --git a/test/fixtures/transformation/esnext-es6-classes/call-super-function.js b/test/fixtures/esnext/es6-classes/call-super-function.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-classes/call-super-function.js
rename to test/fixtures/esnext/es6-classes/call-super-function.js
diff --git a/test/fixtures/transformation/esnext-es6-classes/class-expressions.js b/test/fixtures/esnext/es6-classes/class-expressions.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-classes/class-expressions.js
rename to test/fixtures/esnext/es6-classes/class-expressions.js
diff --git a/test/fixtures/transformation/esnext-es6-classes/class-extend.js b/test/fixtures/esnext/es6-classes/class-extend.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-classes/class-extend.js
rename to test/fixtures/esnext/es6-classes/class-extend.js
diff --git a/test/fixtures/transformation/esnext-es6-classes/class-with-constructor.js b/test/fixtures/esnext/es6-classes/class-with-constructor.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-classes/class-with-constructor.js
rename to test/fixtures/esnext/es6-classes/class-with-constructor.js
diff --git a/test/fixtures/transformation/esnext-es6-classes/class-with-method-declaration.js b/test/fixtures/esnext/es6-classes/class-with-method-declaration.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-classes/class-with-method-declaration.js
rename to test/fixtures/esnext/es6-classes/class-with-method-declaration.js
diff --git a/test/fixtures/transformation/esnext-es6-classes/empty-named-class.js b/test/fixtures/esnext/es6-classes/empty-named-class.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-classes/empty-named-class.js
rename to test/fixtures/esnext/es6-classes/empty-named-class.js
diff --git a/test/fixtures/transformation/esnext-es6-classes/enumerable.js b/test/fixtures/esnext/es6-classes/enumerable.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-classes/enumerable.js
rename to test/fixtures/esnext/es6-classes/enumerable.js
diff --git a/test/fixtures/transformation/esnext-es6-classes/explicit-super-in-constructor.js b/test/fixtures/esnext/es6-classes/explicit-super-in-constructor.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-classes/explicit-super-in-constructor.js
rename to test/fixtures/esnext/es6-classes/explicit-super-in-constructor.js
diff --git a/test/fixtures/transformation/esnext-es6-classes/extends-null.js b/test/fixtures/esnext/es6-classes/extends-null.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-classes/extends-null.js
rename to test/fixtures/esnext/es6-classes/extends-null.js
diff --git a/test/fixtures/transformation/esnext-es6-classes/.getter-setter-super.js b/test/fixtures/esnext/es6-classes/getter-setter-super.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-classes/.getter-setter-super.js
rename to test/fixtures/esnext/es6-classes/getter-setter-super.js
diff --git a/test/fixtures/transformation/esnext-es6-classes/getter-setter.js b/test/fixtures/esnext/es6-classes/getter-setter.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-classes/getter-setter.js
rename to test/fixtures/esnext/es6-classes/getter-setter.js
diff --git a/test/fixtures/transformation/esnext-es6-classes/implicit-superclass.js b/test/fixtures/esnext/es6-classes/implicit-superclass.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-classes/implicit-superclass.js
rename to test/fixtures/esnext/es6-classes/implicit-superclass.js
diff --git a/test/fixtures/transformation/esnext-es6-classes/method-declaration-with-arguments.js b/test/fixtures/esnext/es6-classes/method-declaration-with-arguments.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-classes/method-declaration-with-arguments.js
rename to test/fixtures/esnext/es6-classes/method-declaration-with-arguments.js
diff --git a/test/fixtures/transformation/esnext-es6-classes/methods-are-writable.js b/test/fixtures/esnext/es6-classes/methods-are-writable.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-classes/methods-are-writable.js
rename to test/fixtures/esnext/es6-classes/methods-are-writable.js
diff --git a/test/fixtures/transformation/esnext-es6-classes/methods-with-rest-params.js b/test/fixtures/esnext/es6-classes/methods-with-rest-params.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-classes/methods-with-rest-params.js
rename to test/fixtures/esnext/es6-classes/methods-with-rest-params.js
diff --git a/test/fixtures/transformation/esnext-es6-classes/static-getter.js b/test/fixtures/esnext/es6-classes/static-getter.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-classes/static-getter.js
rename to test/fixtures/esnext/es6-classes/static-getter.js
diff --git a/test/fixtures/transformation/esnext-es6-classes/static-method.js b/test/fixtures/esnext/es6-classes/static-method.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-classes/static-method.js
rename to test/fixtures/esnext/es6-classes/static-method.js
diff --git a/test/fixtures/transformation/esnext-es6-classes/static-setter.js b/test/fixtures/esnext/es6-classes/static-setter.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-classes/static-setter.js
rename to test/fixtures/esnext/es6-classes/static-setter.js
diff --git a/test/fixtures/transformation/esnext-es6-classes/.super-change-proto.js b/test/fixtures/esnext/es6-classes/super-change-proto.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-classes/.super-change-proto.js
rename to test/fixtures/esnext/es6-classes/super-change-proto.js
diff --git a/test/fixtures/transformation/esnext-es6-computed-properties/accessor.js b/test/fixtures/esnext/es6-computed-properties/accessor.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-computed-properties/accessor.js
rename to test/fixtures/esnext/es6-computed-properties/accessor.js
diff --git a/test/fixtures/transformation/esnext-es6-computed-properties/method.js b/test/fixtures/esnext/es6-computed-properties/method.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-computed-properties/method.js
rename to test/fixtures/esnext/es6-computed-properties/method.js
diff --git a/test/fixtures/transformation/esnext-es6-computed-properties/nested.js b/test/fixtures/esnext/es6-computed-properties/nested.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-computed-properties/nested.js
rename to test/fixtures/esnext/es6-computed-properties/nested.js
diff --git a/test/fixtures/transformation/esnext-es6-computed-properties/simple.js b/test/fixtures/esnext/es6-computed-properties/simple.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-computed-properties/simple.js
rename to test/fixtures/esnext/es6-computed-properties/simple.js
diff --git a/test/fixtures/transformation/esnext-es6-default-parameters/arity.js b/test/fixtures/esnext/es6-default-parameters/arity.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-default-parameters/arity.js
rename to test/fixtures/esnext/es6-default-parameters/arity.js
diff --git a/test/fixtures/transformation/esnext-es6-default-parameters/arrow-function.js b/test/fixtures/esnext/es6-default-parameters/arrow-function.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-default-parameters/arrow-function.js
rename to test/fixtures/esnext/es6-default-parameters/arrow-function.js
diff --git a/test/fixtures/transformation/esnext-es6-default-parameters/null-vs-undefined.js b/test/fixtures/esnext/es6-default-parameters/null-vs-undefined.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-default-parameters/null-vs-undefined.js
rename to test/fixtures/esnext/es6-default-parameters/null-vs-undefined.js
diff --git a/test/fixtures/transformation/esnext-es6-default-parameters/scope.js b/test/fixtures/esnext/es6-default-parameters/scope.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-default-parameters/scope.js
rename to test/fixtures/esnext/es6-default-parameters/scope.js
diff --git a/test/fixtures/transformation/esnext-es6-default-parameters/simple-function.js b/test/fixtures/esnext/es6-default-parameters/simple-function.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-default-parameters/simple-function.js
rename to test/fixtures/esnext/es6-default-parameters/simple-function.js
diff --git a/test/fixtures/transformation/esnext-es6-object-concise/method-arguments.js b/test/fixtures/esnext/es6-object-concise/method-arguments.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-object-concise/method-arguments.js
rename to test/fixtures/esnext/es6-object-concise/method-arguments.js
diff --git a/test/fixtures/transformation/esnext-es6-object-concise/method-context.js b/test/fixtures/esnext/es6-object-concise/method-context.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-object-concise/method-context.js
rename to test/fixtures/esnext/es6-object-concise/method-context.js
diff --git a/test/fixtures/transformation/esnext-es6-object-concise/method-has-name.js b/test/fixtures/esnext/es6-object-concise/method-has-name.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-object-concise/method-has-name.js
rename to test/fixtures/esnext/es6-object-concise/method-has-name.js
diff --git a/test/fixtures/transformation/esnext-es6-object-concise/method-is-not-in-scope-inside.js b/test/fixtures/esnext/es6-object-concise/method-is-not-in-scope-inside.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-object-concise/method-is-not-in-scope-inside.js
rename to test/fixtures/esnext/es6-object-concise/method-is-not-in-scope-inside.js
diff --git a/test/fixtures/transformation/esnext-es6-object-concise/method-to-string.js b/test/fixtures/esnext/es6-object-concise/method-to-string.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-object-concise/method-to-string.js
rename to test/fixtures/esnext/es6-object-concise/method-to-string.js
diff --git a/test/fixtures/transformation/esnext-es6-object-concise/method.js b/test/fixtures/esnext/es6-object-concise/method.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-object-concise/method.js
rename to test/fixtures/esnext/es6-object-concise/method.js
diff --git a/test/fixtures/transformation/esnext-es6-rest-parameters/arrow-fn.js b/test/fixtures/esnext/es6-rest-parameters/arrow-fn.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-rest-parameters/arrow-fn.js
rename to test/fixtures/esnext/es6-rest-parameters/arrow-fn.js
diff --git a/test/fixtures/transformation/esnext-es6-rest-parameters/declaration.js b/test/fixtures/esnext/es6-rest-parameters/declaration.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-rest-parameters/declaration.js
rename to test/fixtures/esnext/es6-rest-parameters/declaration.js
diff --git a/test/fixtures/transformation/esnext-es6-rest-parameters/rest.js b/test/fixtures/esnext/es6-rest-parameters/rest.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-rest-parameters/rest.js
rename to test/fixtures/esnext/es6-rest-parameters/rest.js
diff --git a/test/fixtures/transformation/esnext-es6-spread/arguments-as-array.js b/test/fixtures/esnext/es6-spread/arguments-as-array.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-spread/arguments-as-array.js
rename to test/fixtures/esnext/es6-spread/arguments-as-array.js
diff --git a/test/fixtures/transformation/esnext-es6-spread/array-literal.js b/test/fixtures/esnext/es6-spread/array-literal.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-spread/array-literal.js
rename to test/fixtures/esnext/es6-spread/array-literal.js
diff --git a/test/fixtures/transformation/esnext-es6-spread/call-with-array-literal.js b/test/fixtures/esnext/es6-spread/call-with-array-literal.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-spread/call-with-array-literal.js
rename to test/fixtures/esnext/es6-spread/call-with-array-literal.js
diff --git a/test/fixtures/transformation/esnext-es6-spread/inside-function-expression.js b/test/fixtures/esnext/es6-spread/inside-function-expression.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-spread/inside-function-expression.js
rename to test/fixtures/esnext/es6-spread/inside-function-expression.js
diff --git a/test/fixtures/transformation/esnext-es6-spread/iterator.js b/test/fixtures/esnext/es6-spread/iterator.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-spread/iterator.js
rename to test/fixtures/esnext/es6-spread/iterator.js
diff --git a/test/fixtures/transformation/esnext-es6-spread/new-object.js b/test/fixtures/esnext/es6-spread/new-object.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-spread/new-object.js
rename to test/fixtures/esnext/es6-spread/new-object.js
diff --git a/test/fixtures/transformation/esnext-es6-spread/preserve-context.js b/test/fixtures/esnext/es6-spread/preserve-context.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-spread/preserve-context.js
rename to test/fixtures/esnext/es6-spread/preserve-context.js
diff --git a/test/fixtures/transformation/esnext-es6-spread/simple-function-call.js b/test/fixtures/esnext/es6-spread/simple-function-call.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-spread/simple-function-call.js
rename to test/fixtures/esnext/es6-spread/simple-function-call.js
diff --git a/test/fixtures/transformation/esnext-es6-templates/multi-line.js b/test/fixtures/esnext/es6-templates/multi-line.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-templates/multi-line.js
rename to test/fixtures/esnext/es6-templates/multi-line.js
diff --git a/test/fixtures/transformation/esnext-es6-templates/nested-interpolation.js b/test/fixtures/esnext/es6-templates/nested-interpolation.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-templates/nested-interpolation.js
rename to test/fixtures/esnext/es6-templates/nested-interpolation.js
diff --git a/test/fixtures/transformation/esnext-es6-templates/no-interpolation.js b/test/fixtures/esnext/es6-templates/no-interpolation.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-templates/no-interpolation.js
rename to test/fixtures/esnext/es6-templates/no-interpolation.js
diff --git a/test/fixtures/transformation/esnext-es6-templates/raw-tagged-template-expression.js b/test/fixtures/esnext/es6-templates/raw-tagged-template-expression.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-templates/raw-tagged-template-expression.js
rename to test/fixtures/esnext/es6-templates/raw-tagged-template-expression.js
diff --git a/test/fixtures/transformation/esnext-es6-templates/simple-interpolation.js b/test/fixtures/esnext/es6-templates/simple-interpolation.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-templates/simple-interpolation.js
rename to test/fixtures/esnext/es6-templates/simple-interpolation.js
diff --git a/test/fixtures/transformation/esnext-es6-templates/tagged-template-expression.js b/test/fixtures/esnext/es6-templates/tagged-template-expression.js
similarity index 100%
rename from test/fixtures/transformation/esnext-es6-templates/tagged-template-expression.js
rename to test/fixtures/esnext/es6-templates/tagged-template-expression.js