diff --git a/test/fixtures/experimental/decorators-stage-2/class-decorator-call-expr/actual.js b/test/fixtures/experimental/decorators-2/class-decorator-call-expr/actual.js
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/class-decorator-call-expr/actual.js
rename to test/fixtures/experimental/decorators-2/class-decorator-call-expr/actual.js
diff --git a/test/fixtures/experimental/decorators-stage-2/class-decorator-call-expr/expected.json b/test/fixtures/experimental/decorators-2/class-decorator-call-expr/expected.json
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/class-decorator-call-expr/expected.json
rename to test/fixtures/experimental/decorators-2/class-decorator-call-expr/expected.json
diff --git a/test/fixtures/experimental/decorators-stage-2/class-decorator/actual.js b/test/fixtures/experimental/decorators-2/class-decorator/actual.js
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/class-decorator/actual.js
rename to test/fixtures/experimental/decorators-2/class-decorator/actual.js
diff --git a/test/fixtures/experimental/decorators-stage-2/class-decorator/expected.json b/test/fixtures/experimental/decorators-2/class-decorator/expected.json
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/class-decorator/expected.json
rename to test/fixtures/experimental/decorators-2/class-decorator/expected.json
diff --git a/test/fixtures/experimental/decorators-stage-2/class-expression/actual.js b/test/fixtures/experimental/decorators-2/class-expression/actual.js
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/class-expression/actual.js
rename to test/fixtures/experimental/decorators-2/class-expression/actual.js
diff --git a/test/fixtures/experimental/decorators-stage-2/class-expression/expected.json b/test/fixtures/experimental/decorators-2/class-expression/expected.json
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/class-expression/expected.json
rename to test/fixtures/experimental/decorators-2/class-expression/expected.json
diff --git a/test/fixtures/experimental/decorators-stage-2/class-generator/actual.js b/test/fixtures/experimental/decorators-2/class-generator/actual.js
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/class-generator/actual.js
rename to test/fixtures/experimental/decorators-2/class-generator/actual.js
diff --git a/test/fixtures/experimental/decorators-stage-2/class-generator/expected.json b/test/fixtures/experimental/decorators-2/class-generator/expected.json
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/class-generator/expected.json
rename to test/fixtures/experimental/decorators-2/class-generator/expected.json
diff --git a/test/fixtures/experimental/decorators-stage-2/complex-expr/actual.js b/test/fixtures/experimental/decorators-2/complex-expr/actual.js
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/complex-expr/actual.js
rename to test/fixtures/experimental/decorators-2/complex-expr/actual.js
diff --git a/test/fixtures/experimental/decorators-stage-2/complex-expr/expected.json b/test/fixtures/experimental/decorators-2/complex-expr/expected.json
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/complex-expr/expected.json
rename to test/fixtures/experimental/decorators-2/complex-expr/expected.json
diff --git a/test/fixtures/experimental/decorators-stage-2/export-decorated-class/actual.js b/test/fixtures/experimental/decorators-2/export-decorated-class/actual.js
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/export-decorated-class/actual.js
rename to test/fixtures/experimental/decorators-2/export-decorated-class/actual.js
diff --git a/test/fixtures/experimental/decorators-stage-2/export-decorated-class/expected.json b/test/fixtures/experimental/decorators-2/export-decorated-class/expected.json
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/export-decorated-class/expected.json
rename to test/fixtures/experimental/decorators-2/export-decorated-class/expected.json
diff --git a/test/fixtures/experimental/decorators-stage-2/export-decorated-class/options.json b/test/fixtures/experimental/decorators-2/export-decorated-class/options.json
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/export-decorated-class/options.json
rename to test/fixtures/experimental/decorators-2/export-decorated-class/options.json
diff --git a/test/fixtures/experimental/decorators-stage-2/no-class-method-parameter/actual.js b/test/fixtures/experimental/decorators-2/no-class-method-parameter/actual.js
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/no-class-method-parameter/actual.js
rename to test/fixtures/experimental/decorators-2/no-class-method-parameter/actual.js
diff --git a/test/fixtures/experimental/decorators-stage-2/no-class-method-parameter/options.json b/test/fixtures/experimental/decorators-2/no-class-method-parameter/options.json
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/no-class-method-parameter/options.json
rename to test/fixtures/experimental/decorators-2/no-class-method-parameter/options.json
diff --git a/test/fixtures/experimental/decorators-stage-2/no-class-property/actual.js b/test/fixtures/experimental/decorators-2/no-class-property/actual.js
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/no-class-property/actual.js
rename to test/fixtures/experimental/decorators-2/no-class-property/actual.js
diff --git a/test/fixtures/experimental/decorators-stage-2/no-class-property/options.json b/test/fixtures/experimental/decorators-2/no-class-property/options.json
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/no-class-property/options.json
rename to test/fixtures/experimental/decorators-2/no-class-property/options.json
diff --git a/test/fixtures/experimental/decorators-stage-2/no-computed-decorator-member/actual.js b/test/fixtures/experimental/decorators-2/no-computed-decorator-member/actual.js
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/no-computed-decorator-member/actual.js
rename to test/fixtures/experimental/decorators-2/no-computed-decorator-member/actual.js
diff --git a/test/fixtures/experimental/decorators-stage-2/no-computed-decorator-member/options.json b/test/fixtures/experimental/decorators-2/no-computed-decorator-member/options.json
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/no-computed-decorator-member/options.json
rename to test/fixtures/experimental/decorators-2/no-computed-decorator-member/options.json
diff --git a/test/fixtures/experimental/decorators-stage-2/no-constructor-decorators/actual.js b/test/fixtures/experimental/decorators-2/no-constructor-decorators/actual.js
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/no-constructor-decorators/actual.js
rename to test/fixtures/experimental/decorators-2/no-constructor-decorators/actual.js
diff --git a/test/fixtures/experimental/decorators-stage-2/no-constructor-decorators/options.json b/test/fixtures/experimental/decorators-2/no-constructor-decorators/options.json
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/no-constructor-decorators/options.json
rename to test/fixtures/experimental/decorators-2/no-constructor-decorators/options.json
diff --git a/test/fixtures/experimental/decorators-stage-2/no-export-decorators-on-class/actual.js b/test/fixtures/experimental/decorators-2/no-export-decorators-on-class/actual.js
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/no-export-decorators-on-class/actual.js
rename to test/fixtures/experimental/decorators-2/no-export-decorators-on-class/actual.js
diff --git a/test/fixtures/experimental/decorators-stage-2/no-export-decorators-on-class/options.json b/test/fixtures/experimental/decorators-2/no-export-decorators-on-class/options.json
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/no-export-decorators-on-class/options.json
rename to test/fixtures/experimental/decorators-2/no-export-decorators-on-class/options.json
diff --git a/test/fixtures/experimental/decorators-stage-2/no-function-parameters/actual.js b/test/fixtures/experimental/decorators-2/no-function-parameters/actual.js
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/no-function-parameters/actual.js
rename to test/fixtures/experimental/decorators-2/no-function-parameters/actual.js
diff --git a/test/fixtures/experimental/decorators-stage-2/no-function-parameters/options.json b/test/fixtures/experimental/decorators-2/no-function-parameters/options.json
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/no-function-parameters/options.json
rename to test/fixtures/experimental/decorators-2/no-function-parameters/options.json
diff --git a/test/fixtures/experimental/decorators-stage-2/no-object-method-parameters/actual.js b/test/fixtures/experimental/decorators-2/no-object-method-parameters/actual.js
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/no-object-method-parameters/actual.js
rename to test/fixtures/experimental/decorators-2/no-object-method-parameters/actual.js
diff --git a/test/fixtures/experimental/decorators-stage-2/no-object-method-parameters/options.json b/test/fixtures/experimental/decorators-2/no-object-method-parameters/options.json
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/no-object-method-parameters/options.json
rename to test/fixtures/experimental/decorators-2/no-object-method-parameters/options.json
diff --git a/test/fixtures/experimental/decorators-stage-2/no-object-methods/actual.js b/test/fixtures/experimental/decorators-2/no-object-methods/actual.js
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/no-object-methods/actual.js
rename to test/fixtures/experimental/decorators-2/no-object-methods/actual.js
diff --git a/test/fixtures/experimental/decorators-stage-2/no-object-methods/options.json b/test/fixtures/experimental/decorators-2/no-object-methods/options.json
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/no-object-methods/options.json
rename to test/fixtures/experimental/decorators-2/no-object-methods/options.json
diff --git a/test/fixtures/experimental/decorators-stage-2/no-private-property/actual.js b/test/fixtures/experimental/decorators-2/no-private-property/actual.js
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/no-private-property/actual.js
rename to test/fixtures/experimental/decorators-2/no-private-property/actual.js
diff --git a/test/fixtures/experimental/decorators-stage-2/no-private-property/options.json b/test/fixtures/experimental/decorators-2/no-private-property/options.json
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/no-private-property/options.json
rename to test/fixtures/experimental/decorators-2/no-private-property/options.json
diff --git a/test/fixtures/experimental/decorators-stage-2/no-semi/actual.js b/test/fixtures/experimental/decorators-2/no-semi/actual.js
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/no-semi/actual.js
rename to test/fixtures/experimental/decorators-2/no-semi/actual.js
diff --git a/test/fixtures/experimental/decorators-stage-2/no-semi/options.json b/test/fixtures/experimental/decorators-2/no-semi/options.json
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/no-semi/options.json
rename to test/fixtures/experimental/decorators-2/no-semi/options.json
diff --git a/test/fixtures/experimental/decorators-stage-2/no-static-property/actual.js b/test/fixtures/experimental/decorators-2/no-static-property/actual.js
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/no-static-property/actual.js
rename to test/fixtures/experimental/decorators-2/no-static-property/actual.js
diff --git a/test/fixtures/experimental/decorators-stage-2/no-static-property/options.json b/test/fixtures/experimental/decorators-2/no-static-property/options.json
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/no-static-property/options.json
rename to test/fixtures/experimental/decorators-2/no-static-property/options.json
diff --git a/test/fixtures/experimental/decorators-stage-2/on-computed-name-method/actual.js b/test/fixtures/experimental/decorators-2/on-computed-name-method/actual.js
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/on-computed-name-method/actual.js
rename to test/fixtures/experimental/decorators-2/on-computed-name-method/actual.js
diff --git a/test/fixtures/experimental/decorators-stage-2/on-computed-name-method/expected.json b/test/fixtures/experimental/decorators-2/on-computed-name-method/expected.json
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/on-computed-name-method/expected.json
rename to test/fixtures/experimental/decorators-2/on-computed-name-method/expected.json
diff --git a/test/fixtures/experimental/decorators-stage-2/options.json b/test/fixtures/experimental/decorators-2/options.json
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/options.json
rename to test/fixtures/experimental/decorators-2/options.json
diff --git a/test/fixtures/experimental/decorators-stage-2/plugin-conflict/actual.js b/test/fixtures/experimental/decorators-2/plugin-conflict/actual.js
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/plugin-conflict/actual.js
rename to test/fixtures/experimental/decorators-2/plugin-conflict/actual.js
diff --git a/test/fixtures/experimental/decorators-stage-2/plugin-conflict/options.json b/test/fixtures/experimental/decorators-2/plugin-conflict/options.json
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/plugin-conflict/options.json
rename to test/fixtures/experimental/decorators-2/plugin-conflict/options.json
diff --git a/test/fixtures/experimental/decorators-stage-2/restricted-1/actual.js b/test/fixtures/experimental/decorators-2/restricted-1/actual.js
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/restricted-1/actual.js
rename to test/fixtures/experimental/decorators-2/restricted-1/actual.js
diff --git a/test/fixtures/experimental/decorators-stage-2/restricted-1/options.json b/test/fixtures/experimental/decorators-2/restricted-1/options.json
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/restricted-1/options.json
rename to test/fixtures/experimental/decorators-2/restricted-1/options.json
diff --git a/test/fixtures/experimental/decorators-stage-2/restricted-2/actual.js b/test/fixtures/experimental/decorators-2/restricted-2/actual.js
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/restricted-2/actual.js
rename to test/fixtures/experimental/decorators-2/restricted-2/actual.js
diff --git a/test/fixtures/experimental/decorators-stage-2/restricted-2/options.json b/test/fixtures/experimental/decorators-2/restricted-2/options.json
similarity index 100%
rename from test/fixtures/experimental/decorators-stage-2/restricted-2/options.json
rename to test/fixtures/experimental/decorators-2/restricted-2/options.json