diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/class-constructors/mutate-existing-constructor/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-constructors/mutate-existing-constructor/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/class-constructors/mutate-existing-constructor/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-constructors/mutate-existing-constructor/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-constructors/options.json
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/options.json
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-constructors/options.json
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/class-constructors/return-new-constructor/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-constructors/return-new-constructor/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/class-constructors/return-new-constructor/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-constructors/return-new-constructor/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/class-export-default/exec.mjs b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-export-default/exec.mjs
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/class-export-default/exec.mjs
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-export-default/exec.mjs
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-export-default/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-export-default/options.json
new file mode 100644
index 0000000000..c5b3178ebf
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-export-default/options.json
@@ -0,0 +1,7 @@
+{
+  "presets": ["es2015"],
+  "plugins": [
+    ["proposal-decorators", { "legacy": true }],
+    ["proposal-class-properties", { "loose": true }]
+  ]
+}
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-ordering/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-ordering/options.json
new file mode 100644
index 0000000000..c5b3178ebf
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-ordering/options.json
@@ -0,0 +1,7 @@
+{
+  "presets": ["es2015"],
+  "plugins": [
+    ["proposal-decorators", { "legacy": true }],
+    ["proposal-class-properties", { "loose": true }]
+  ]
+}
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/class-ordering/order/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-ordering/order/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/class-ordering/order/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-ordering/order/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/class-ordering/reverse-order/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-ordering/reverse-order/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/class-ordering/reverse-order/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-ordering/reverse-order/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/class-prototype-methods/mutate-descriptor/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-prototype-methods/mutate-descriptor/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/class-prototype-methods/mutate-descriptor/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-prototype-methods/mutate-descriptor/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/class-prototype-methods/numeric-props/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-prototype-methods/numeric-props/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/class-prototype-methods/numeric-props/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-prototype-methods/numeric-props/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-prototype-methods/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-prototype-methods/options.json
new file mode 100644
index 0000000000..c5b3178ebf
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-prototype-methods/options.json
@@ -0,0 +1,7 @@
+{
+  "presets": ["es2015"],
+  "plugins": [
+    ["proposal-decorators", { "legacy": true }],
+    ["proposal-class-properties", { "loose": true }]
+  ]
+}
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/class-prototype-methods/return-descriptor/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-prototype-methods/return-descriptor/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/class-prototype-methods/return-descriptor/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-prototype-methods/return-descriptor/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/class-prototype-methods/string-props/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-prototype-methods/string-props/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/class-prototype-methods/string-props/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-prototype-methods/string-props/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/class-prototype-properties/child-classes-properties/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-prototype-properties/child-classes-properties/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/class-prototype-properties/child-classes-properties/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-prototype-properties/child-classes-properties/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/class-prototype-properties/mutate-descriptor/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-prototype-properties/mutate-descriptor/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/class-prototype-properties/mutate-descriptor/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-prototype-properties/mutate-descriptor/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/class-prototype-properties/mutate-initialzer/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-prototype-properties/mutate-initialzer/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/class-prototype-properties/mutate-initialzer/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-prototype-properties/mutate-initialzer/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-prototype-properties/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-prototype-properties/options.json
new file mode 100644
index 0000000000..c5b3178ebf
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-prototype-properties/options.json
@@ -0,0 +1,7 @@
+{
+  "presets": ["es2015"],
+  "plugins": [
+    ["proposal-decorators", { "legacy": true }],
+    ["proposal-class-properties", { "loose": true }]
+  ]
+}
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/class-prototype-properties/properties-without-initializer/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-prototype-properties/properties-without-initializer/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/class-prototype-properties/properties-without-initializer/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-prototype-properties/properties-without-initializer/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/class-prototype-properties/return-descriptor/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-prototype-properties/return-descriptor/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/class-prototype-properties/return-descriptor/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-prototype-properties/return-descriptor/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/class-static-methods/mutate-descriptor/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-static-methods/mutate-descriptor/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/class-static-methods/mutate-descriptor/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-static-methods/mutate-descriptor/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/class-static-methods/numeric-props/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-static-methods/numeric-props/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/class-static-methods/numeric-props/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-static-methods/numeric-props/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-static-methods/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-static-methods/options.json
new file mode 100644
index 0000000000..c5b3178ebf
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-static-methods/options.json
@@ -0,0 +1,7 @@
+{
+  "presets": ["es2015"],
+  "plugins": [
+    ["proposal-decorators", { "legacy": true }],
+    ["proposal-class-properties", { "loose": true }]
+  ]
+}
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/class-static-methods/return-descriptor/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-static-methods/return-descriptor/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/class-static-methods/return-descriptor/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-static-methods/return-descriptor/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/class-static-methods/string-props/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-static-methods/string-props/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/class-static-methods/string-props/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-static-methods/string-props/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/class-static-properties/mutate-descriptor/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-static-properties/mutate-descriptor/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/class-static-properties/mutate-descriptor/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-static-properties/mutate-descriptor/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/class-static-properties/mutate-initialzer/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-static-properties/mutate-initialzer/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/class-static-properties/mutate-initialzer/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-static-properties/mutate-initialzer/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-static-properties/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-static-properties/options.json
new file mode 100644
index 0000000000..c5b3178ebf
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-static-properties/options.json
@@ -0,0 +1,7 @@
+{
+  "presets": ["es2015"],
+  "plugins": [
+    ["proposal-decorators", { "legacy": true }],
+    ["proposal-class-properties", { "loose": true }]
+  ]
+}
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/class-static-properties/properties-without-initializer/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-static-properties/properties-without-initializer/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/class-static-properties/properties-without-initializer/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-static-properties/properties-without-initializer/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/class-static-properties/return-descriptor/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-static-properties/return-descriptor/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/class-static-properties/return-descriptor/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-static-properties/return-descriptor/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/decl-to-expression/class-decorators/input.mjs b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-decl-to-expression/class-decorators/input.mjs
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/decl-to-expression/class-decorators/input.mjs
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-decl-to-expression/class-decorators/input.mjs
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/decl-to-expression/class-decorators/output.mjs b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-decl-to-expression/class-decorators/output.mjs
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/decl-to-expression/class-decorators/output.mjs
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-decl-to-expression/class-decorators/output.mjs
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/decl-to-expression/method-decorators/input.mjs b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-decl-to-expression/method-decorators/input.mjs
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/decl-to-expression/method-decorators/input.mjs
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-decl-to-expression/method-decorators/input.mjs
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/decl-to-expression/method-decorators/output.mjs b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-decl-to-expression/method-decorators/output.mjs
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/decl-to-expression/method-decorators/output.mjs
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-decl-to-expression/method-decorators/output.mjs
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/decl-to-expression/no-decorators/input.mjs b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-decl-to-expression/no-decorators/input.mjs
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/decl-to-expression/no-decorators/input.mjs
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-decl-to-expression/no-decorators/input.mjs
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/decl-to-expression/no-decorators/output.mjs b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-decl-to-expression/no-decorators/output.mjs
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/decl-to-expression/no-decorators/output.mjs
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-decl-to-expression/no-decorators/output.mjs
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/decl-to-expression/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-decl-to-expression/options.json
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/decl-to-expression/options.json
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-decl-to-expression/options.json
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/object-methods/mutate-descriptor/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-methods/mutate-descriptor/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/object-methods/mutate-descriptor/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-methods/mutate-descriptor/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/object-methods/numeric-props/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-methods/numeric-props/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/object-methods/numeric-props/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-methods/numeric-props/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-methods/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-methods/options.json
new file mode 100644
index 0000000000..c5b3178ebf
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-methods/options.json
@@ -0,0 +1,7 @@
+{
+  "presets": ["es2015"],
+  "plugins": [
+    ["proposal-decorators", { "legacy": true }],
+    ["proposal-class-properties", { "loose": true }]
+  ]
+}
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/object-methods/return-descriptor/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-methods/return-descriptor/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/object-methods/return-descriptor/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-methods/return-descriptor/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/object-methods/string-props/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-methods/string-props/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/object-methods/string-props/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-methods/string-props/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-ordering/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-ordering/options.json
new file mode 100644
index 0000000000..c5b3178ebf
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-ordering/options.json
@@ -0,0 +1,7 @@
+{
+  "presets": ["es2015"],
+  "plugins": [
+    ["proposal-decorators", { "legacy": true }],
+    ["proposal-class-properties", { "loose": true }]
+  ]
+}
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/object-ordering/order/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-ordering/order/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/object-ordering/order/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-ordering/order/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/object-ordering/reverse-order/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-ordering/reverse-order/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/object-ordering/reverse-order/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-ordering/reverse-order/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/object-properties/mutate-descriptor/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-properties/mutate-descriptor/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/object-properties/mutate-descriptor/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-properties/mutate-descriptor/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/object-properties/mutate-initialzer/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-properties/mutate-initialzer/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/object-properties/mutate-initialzer/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-properties/mutate-initialzer/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/object-properties/numeric-props/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-properties/numeric-props/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/object-properties/numeric-props/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-properties/numeric-props/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-properties/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-properties/options.json
new file mode 100644
index 0000000000..c5b3178ebf
--- /dev/null
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-properties/options.json
@@ -0,0 +1,7 @@
+{
+  "presets": ["es2015"],
+  "plugins": [
+    ["proposal-decorators", { "legacy": true }],
+    ["proposal-class-properties", { "loose": true }]
+  ]
+}
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/object-properties/return-descriptor/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-properties/return-descriptor/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/object-properties/return-descriptor/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-properties/return-descriptor/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/object-properties/string-props/exec.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-properties/string-props/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/object-properties/string-props/exec.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-object-properties/string-props/exec.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/regression/7030/input.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-regression/7030/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/regression/7030/input.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-regression/7030/input.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/regression/7030/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-regression/7030/options.json
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/regression/7030/options.json
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-regression/7030/options.json
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/regression/7030/output.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-regression/7030/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-decorators/test/fixtures/regression/7030/output.js
rename to packages/babel-plugin-proposal-decorators/test/fixtures/legacy-regression/7030/output.js