diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/foobar/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/foobar/options.json
index 6d52631c71..46fc38abb7 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/foobar/options.json
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/foobar/options.json
@@ -1,3 +1,7 @@
 {
-  "presets": [["env", { "targets": { "browsers": "ie 6" } }]]
+  "plugins": [
+    ["proposal-class-properties", { "loose": true }],
+    "transform-classes",
+    "transform-arrow-functions"
+  ]
 }
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/foobar/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/foobar/output.js
index c02e9d7904..14c1c62b66 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/foobar/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/foobar/output.js
@@ -1,6 +1,6 @@
 var _scopedFunctionWithThis = /*#__PURE__*/babelHelpers.classPrivateFieldLooseKey("scopedFunctionWithThis");
 
-var Child = /*#__PURE__*/function (_Parent) {
+let Child = /*#__PURE__*/function (_Parent) {
   "use strict";
 
   babelHelpers.inherits(Child, _Parent);
@@ -14,7 +14,7 @@ var Child = /*#__PURE__*/function (_Parent) {
     _this = _super.call(this);
     Object.defineProperty(babelHelpers.assertThisInitialized(_this), _scopedFunctionWithThis, {
       writable: true,
-      value: function value() {
+      value: function () {
         _this.name = {};
       }
     });
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/foobar/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/foobar/options.json
index fb5b42f969..46fc38abb7 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/foobar/options.json
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/foobar/options.json
@@ -1,4 +1,7 @@
 {
-  "plugins": [["proposal-class-properties", { "loose": true }]],
-  "presets": [["env", { "targets": { "browsers": "ie 6" } }]]
+  "plugins": [
+    ["proposal-class-properties", { "loose": true }],
+    "transform-classes",
+    "transform-arrow-functions"
+  ]
 }
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/foobar/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/foobar/output.js
index 86a6067497..e777fc39cc 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/foobar/output.js
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/foobar/output.js
@@ -1,4 +1,4 @@
-var Child = /*#__PURE__*/function (_Parent) {
+let Child = /*#__PURE__*/function (_Parent) {
   "use strict";
 
   babelHelpers.inherits(Child, _Parent);
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-constructors/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-constructors/options.json
index e12b2cb9ef..a8b36fc49a 100644
--- a/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-constructors/options.json
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-class-constructors/options.json
@@ -1,7 +1,7 @@
 {
+  "assumptions": {
+    "setPublicClassFields": true
+  },
   "presets": [["env", { "targets": { "browsers": "ie 6" } }]],
-  "plugins": [
-    ["proposal-decorators", { "legacy": true }],
-    ["proposal-class-properties", { "loose": true }]
-  ]
+  "plugins": [["proposal-decorators", { "legacy": true }]]
 }
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
index e12b2cb9ef..a8b36fc49a 100644
--- 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
@@ -1,7 +1,7 @@
 {
+  "assumptions": {
+    "setPublicClassFields": true
+  },
   "presets": [["env", { "targets": { "browsers": "ie 6" } }]],
-  "plugins": [
-    ["proposal-decorators", { "legacy": true }],
-    ["proposal-class-properties", { "loose": true }]
-  ]
+  "plugins": [["proposal-decorators", { "legacy": 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
index e12b2cb9ef..a8b36fc49a 100644
--- 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
@@ -1,7 +1,7 @@
 {
+  "assumptions": {
+    "setPublicClassFields": true
+  },
   "presets": [["env", { "targets": { "browsers": "ie 6" } }]],
-  "plugins": [
-    ["proposal-decorators", { "legacy": true }],
-    ["proposal-class-properties", { "loose": true }]
-  ]
+  "plugins": [["proposal-decorators", { "legacy": true }]]
 }
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
index 87162d7b2c..349e2f1419 100644
--- 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
@@ -1,8 +1,10 @@
 {
+  "assumptions": {
+    "setPublicClassFields": true
+  },
   "presets": [["env", { "targets": { "browsers": "ie 6" } }]],
   "plugins": [
     ["proposal-decorators", { "legacy": true }],
-    ["proposal-class-properties", { "loose": true }],
     ["babel-plugin-polyfill-es-shims", { "method": "usage-global", "targets": {
       "node": "current"
     }}]
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
index 87162d7b2c..349e2f1419 100644
--- 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
@@ -1,8 +1,10 @@
 {
+  "assumptions": {
+    "setPublicClassFields": true
+  },
   "presets": [["env", { "targets": { "browsers": "ie 6" } }]],
   "plugins": [
     ["proposal-decorators", { "legacy": true }],
-    ["proposal-class-properties", { "loose": true }],
     ["babel-plugin-polyfill-es-shims", { "method": "usage-global", "targets": {
       "node": "current"
     }}]
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
index 87162d7b2c..349e2f1419 100644
--- 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
@@ -1,8 +1,10 @@
 {
+  "assumptions": {
+    "setPublicClassFields": true
+  },
   "presets": [["env", { "targets": { "browsers": "ie 6" } }]],
   "plugins": [
     ["proposal-decorators", { "legacy": true }],
-    ["proposal-class-properties", { "loose": true }],
     ["babel-plugin-polyfill-es-shims", { "method": "usage-global", "targets": {
       "node": "current"
     }}]
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
index 87162d7b2c..349e2f1419 100644
--- 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
@@ -1,8 +1,10 @@
 {
+  "assumptions": {
+    "setPublicClassFields": true
+  },
   "presets": [["env", { "targets": { "browsers": "ie 6" } }]],
   "plugins": [
     ["proposal-decorators", { "legacy": true }],
-    ["proposal-class-properties", { "loose": true }],
     ["babel-plugin-polyfill-es-shims", { "method": "usage-global", "targets": {
       "node": "current"
     }}]
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
index 87162d7b2c..349e2f1419 100644
--- 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
@@ -1,8 +1,10 @@
 {
+  "assumptions": {
+    "setPublicClassFields": true
+  },
   "presets": [["env", { "targets": { "browsers": "ie 6" } }]],
   "plugins": [
     ["proposal-decorators", { "legacy": true }],
-    ["proposal-class-properties", { "loose": true }],
     ["babel-plugin-polyfill-es-shims", { "method": "usage-global", "targets": {
       "node": "current"
     }}]
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
index e12b2cb9ef..a8b36fc49a 100644
--- 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
@@ -1,7 +1,7 @@
 {
+  "assumptions": {
+    "setPublicClassFields": true
+  },
   "presets": [["env", { "targets": { "browsers": "ie 6" } }]],
-  "plugins": [
-    ["proposal-decorators", { "legacy": true }],
-    ["proposal-class-properties", { "loose": true }]
-  ]
+  "plugins": [["proposal-decorators", { "legacy": true }]]
 }
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
index 87162d7b2c..349e2f1419 100644
--- 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
@@ -1,8 +1,10 @@
 {
+  "assumptions": {
+    "setPublicClassFields": true
+  },
   "presets": [["env", { "targets": { "browsers": "ie 6" } }]],
   "plugins": [
     ["proposal-decorators", { "legacy": true }],
-    ["proposal-class-properties", { "loose": true }],
     ["babel-plugin-polyfill-es-shims", { "method": "usage-global", "targets": {
       "node": "current"
     }}]