diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/arrow-static-this-without-transform/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/arrow-static-this-without-transform/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/arrow-static-this-without-transform/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/arrow-static-this-without-transform/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/arrow-static-this-without-transform/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/arrow-static-this-without-transform/options.json
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/arrow-static-this-without-transform/options.json
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/arrow-static-this-without-transform/options.json
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/arrow-static-this-without-transform/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/arrow-static-this-without-transform/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/arrow-static-this-without-transform/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/arrow-static-this-without-transform/output.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/arrow-this-without-transform/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/arrow-this-without-transform/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/arrow-this-without-transform/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/arrow-this-without-transform/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/arrow-this-without-transform/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/arrow-this-without-transform/options.json
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/arrow-this-without-transform/options.json
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/arrow-this-without-transform/options.json
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/computed-initialization-order/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/computed-initialization-order/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/computed-initialization-order/exec.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/computed-initialization-order/exec.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/computed/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/computed/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/computed/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/computed/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/computed/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/computed/output.js
new file mode 100644
index 0000000000..0c45f99e1d
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/computed/output.js
@@ -0,0 +1,63 @@
+var foo = "foo";
+
+var bar = () => {};
+
+var four = 4;
+
+var _one = one();
+
+var _ref = 2 * four + seven;
+
+var _undefined = undefined;
+
+var _computed = computed();
+
+var _computed2 = computed();
+
+var _ref2 = "test" + one;
+
+var _ref3 = /regex/;
+var _bar = bar;
+var _baz = baz;
+var _ref4 = `template${expression}`;
+
+var MyClass =
+/*#__PURE__*/
+function () {
+  function MyClass() {
+    babelHelpers.classCallCheck(this, MyClass);
+    this[null] = "null";
+    this[_undefined] = "undefined";
+    this[void 0] = "void 0";
+    this[_ref3] = "regex";
+    this[foo] = "foo";
+    this[_bar] = "bar";
+    this[_baz] = "baz";
+    this[`template`] = "template";
+    this[_ref4] = "template-with-expression";
+  }
+
+  babelHelpers.createClass(MyClass, [{
+    key: _ref2,
+    value: function () {}
+  }, {
+    key: "whatever",
+    get: function () {},
+    set: function (value) {}
+  }, {
+    key: _computed,
+    get: function () {}
+  }, {
+    key: _computed2,
+    set: function (value) {}
+  }], [{
+    key: 10,
+    value: function () {}
+  }]);
+  return MyClass;
+}();
+
+MyClass[_one] = "test";
+MyClass[2 * 4 + 7] = "247";
+MyClass[2 * four + 7] = "247";
+MyClass[_ref] = "247";
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/constructor-collision/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/constructor-collision/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/constructor-collision/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/constructor-collision/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/constructor-collision/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/constructor-collision/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/constructor-collision/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/constructor-collision/output.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/derived/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/derived/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/derived/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/derived/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/derived/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/derived/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/derived/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/derived/output.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/foobar/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/foobar/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/foobar/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/foobar/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/foobar/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/foobar/options.json
similarity index 71%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/foobar/options.json
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/foobar/options.json
index c896d6daaa..49003d6aa0 100644
--- a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/foobar/options.json
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/foobar/options.json
@@ -1,4 +1,4 @@
 {
   "plugins": ["external-helpers", ["proposal-class-properties", {"loose": true}]],
-  "presets": ["es2015"]
+  "presets": ["stage-0", "es2015"]
 }
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/foobar/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/foobar/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/foobar/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/foobar/output.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/instance-computed/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/instance-computed/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/instance-computed/exec.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/instance-computed/exec.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/instance-computed/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/instance-computed/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/instance-computed/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/instance-computed/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/instance-computed/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/instance-computed/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/instance-computed/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/instance-computed/output.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/instance-undefined/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/instance-undefined/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/instance-undefined/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/instance-undefined/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/instance-undefined/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/instance-undefined/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/instance-undefined/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/instance-undefined/output.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/instance/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/instance/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/instance/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/instance/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/instance/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/instance/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/instance/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/instance/output.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/non-block-arrow-func/input.mjs b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/non-block-arrow-func/input.mjs
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/non-block-arrow-func/input.mjs
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/non-block-arrow-func/input.mjs
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/non-block-arrow-func/output.mjs b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/non-block-arrow-func/output.mjs
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/non-block-arrow-func/output.mjs
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/non-block-arrow-func/output.mjs
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/options.json
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/options.json
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/options.json
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/regression-T2983/input.mjs b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/regression-T2983/input.mjs
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/regression-T2983/input.mjs
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/regression-T2983/input.mjs
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/regression-T2983/output.mjs b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/regression-T2983/output.mjs
new file mode 100644
index 0000000000..371191a12b
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/regression-T2983/output.mjs
@@ -0,0 +1,13 @@
+var _class, _temp;
+
+call((_temp = _class = function _class() {
+  babelHelpers.classCallCheck(this, _class);
+}, _class.test = true, _temp));
+
+var _default = function _default() {
+  babelHelpers.classCallCheck(this, _default);
+};
+
+_default.test = true;
+export { _default as default };
+;
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/regression-T6719/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/regression-T6719/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/regression-T6719/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/regression-T6719/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/regression-T6719/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/regression-T6719/output.js
new file mode 100644
index 0000000000..135dd0301e
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/regression-T6719/output.js
@@ -0,0 +1,22 @@
+function withContext(ComposedComponent) {
+  var _class, _temp;
+
+  return _temp = _class =
+  /*#__PURE__*/
+  function (_Component) {
+    babelHelpers.inherits(WithContext, _Component);
+
+    function WithContext() {
+      babelHelpers.classCallCheck(this, WithContext);
+      return babelHelpers.possibleConstructorReturn(this, (WithContext.__proto__ || Object.getPrototypeOf(WithContext)).apply(this, arguments));
+    }
+
+    return WithContext;
+  }(Component), _class.propTypes = {
+    context: PropTypes.shape({
+      addCss: PropTypes.func,
+      setTitle: PropTypes.func,
+      setMeta: PropTypes.func
+    })
+  }, _temp;
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/regression-T7364/input.mjs b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/regression-T7364/input.mjs
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/regression-T7364/input.mjs
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/regression-T7364/input.mjs
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/regression-T7364/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/regression-T7364/options.json
new file mode 100644
index 0000000000..baedce5591
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/regression-T7364/options.json
@@ -0,0 +1,7 @@
+{
+  "plugins": [
+    "external-helpers",
+    "transform-async-to-generator",
+    ["proposal-class-properties", {"loose": true}]
+  ]
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/regression-T7364/output.mjs b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/regression-T7364/output.mjs
new file mode 100644
index 0000000000..1fa6373e31
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/regression-T7364/output.mjs
@@ -0,0 +1,38 @@
+class MyClass {
+  constructor() {
+    var _this = this;
+
+    this.myAsyncMethod =
+    /*#__PURE__*/
+    babelHelpers.asyncToGenerator(function* () {
+      console.log(_this);
+    });
+  }
+
+}
+
+(class MyClass2 {
+  constructor() {
+    var _this2 = this;
+
+    this.myAsyncMethod =
+    /*#__PURE__*/
+    babelHelpers.asyncToGenerator(function* () {
+      console.log(_this2);
+    });
+  }
+
+});
+
+export default class MyClass3 {
+  constructor() {
+    var _this3 = this;
+
+    this.myAsyncMethod =
+    /*#__PURE__*/
+    babelHelpers.asyncToGenerator(function* () {
+      console.log(_this3);
+    });
+  }
+
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/static-export/input.mjs b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-export/input.mjs
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/static-export/input.mjs
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-export/input.mjs
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/static-export/output.mjs b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-export/output.mjs
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/static-export/output.mjs
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-export/output.mjs
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/static-infer-name/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-infer-name/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/static-infer-name/exec.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-infer-name/exec.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/static-infer-name/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-infer-name/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/static-infer-name/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-infer-name/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/static-infer-name/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-infer-name/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/static-infer-name/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-infer-name/output.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/static-undefined/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-undefined/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/static-undefined/exec.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-undefined/exec.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/static-undefined/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-undefined/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/static-undefined/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-undefined/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/static-undefined/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-undefined/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/static-undefined/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static-undefined/output.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/static/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/static/exec.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static/exec.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/static/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/static/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/static/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/static/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/static/output.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/super-call/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/super-call/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/super-call/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/super-call/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/super-call/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/super-call/output.js
new file mode 100644
index 0000000000..ae8920c830
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/super-call/output.js
@@ -0,0 +1,30 @@
+var A =
+/*#__PURE__*/
+function () {
+  function A() {
+    babelHelpers.classCallCheck(this, A);
+  }
+
+  babelHelpers.createClass(A, [{
+    key: "foo",
+    value: function foo() {
+      return "bar";
+    }
+  }]);
+  return A;
+}();
+
+var B =
+/*#__PURE__*/
+function (_A) {
+  babelHelpers.inherits(B, _A);
+
+  function B(...args) {
+    var _temp, _this;
+
+    babelHelpers.classCallCheck(this, B);
+    return babelHelpers.possibleConstructorReturn(_this, (_temp = _this = babelHelpers.possibleConstructorReturn(this, (B.__proto__ || Object.getPrototypeOf(B)).call(this, ...args)), _this.foo = babelHelpers.get(B.prototype.__proto__ || Object.getPrototypeOf(B.prototype), "foo", babelHelpers.assertThisInitialized(_this)).call(_this), _temp));
+  }
+
+  return B;
+}(A);
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/super-expression/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/super-expression/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/super-expression/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/super-expression/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/super-expression/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/super-expression/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/super-expression/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/super-expression/output.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/super-statement/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/super-statement/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/super-statement/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/super-statement/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/super-statement/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/super-statement/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/super-statement/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/super-statement/output.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/super-with-collision/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/super-with-collision/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/super-with-collision/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/super-with-collision/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/super-with-collision/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/super-with-collision/output.js
new file mode 100644
index 0000000000..9b483cdad6
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/super-with-collision/output.js
@@ -0,0 +1,5 @@
+var A = function A(_force) {
+  babelHelpers.classCallCheck(this, A);
+  this.force = force;
+  this.foo = babelHelpers.get(A.prototype.__proto__ || Object.getPrototypeOf(A.prototype), "method", babelHelpers.assertThisInitialized(this)).call(this);
+};
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/arrow-static-this-without-transform/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/arrow-static-this-without-transform/input.js
new file mode 100644
index 0000000000..2658970d52
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/arrow-static-this-without-transform/input.js
@@ -0,0 +1,3 @@
+class Foo {
+  static fn = () => console.log(this);
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/arrow-static-this-without-transform/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/arrow-static-this-without-transform/options.json
new file mode 100644
index 0000000000..f2532d47d9
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/arrow-static-this-without-transform/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["external-helpers", "transform-arrow-functions", "syntax-class-properties"]
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/arrow-static-this-without-transform/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/arrow-static-this-without-transform/output.js
new file mode 100644
index 0000000000..7dc20a774c
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/arrow-static-this-without-transform/output.js
@@ -0,0 +1,7 @@
+var _this = this;
+
+class Foo {
+  static fn = function () {
+    return console.log(_this);
+  };
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/arrow-this-without-transform/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/arrow-this-without-transform/input.js
new file mode 100644
index 0000000000..963f1aa2a6
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/arrow-this-without-transform/input.js
@@ -0,0 +1,3 @@
+class Foo {
+  fn = () => console.log(this);
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/arrow-this-without-transform/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/arrow-this-without-transform/options.json
new file mode 100644
index 0000000000..83a71b9161
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/arrow-this-without-transform/options.json
@@ -0,0 +1,4 @@
+{
+  "plugins": ["external-helpers", "transform-arrow-functions", "syntax-class-properties"],
+  "throws": "Unable to transform arrow inside class property"
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/computed-initialization-order/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/computed-initialization-order/exec.js
new file mode 100644
index 0000000000..339de138c7
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/computed-initialization-order/exec.js
@@ -0,0 +1,38 @@
+const actualOrder = [];
+
+const track = i => {
+  actualOrder.push(i);
+  return i;
+};
+
+class MyClass {
+  static [track(1)] = track(10);
+  [track(2)] = track(13);
+  get [track(3)]() {
+    return "foo";
+  }
+  set [track(4)](value) {
+    this.bar = value;
+  }
+  [track(5)] = track(14);
+  static [track(6)] = track(11);
+  static [track(7)] = track(12);
+  [track(8)]() {}
+  [track(9)] = track(15);
+}
+
+const inst = new MyClass();
+
+const expectedOrder = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15];
+expect(actualOrder).toEqual(expectedOrder);
+
+expect(MyClass[1]).toBe(10);
+expect(inst[2]).toBe(13);
+expect(inst[3]).toBe("foo");
+inst[4] = "baz";
+expect(inst.bar).toBe("baz");
+expect(inst[5]).toBe(14);
+expect(MyClass[6]).toBe(11);
+expect(MyClass[7]).toBe(12);
+expect(typeof inst[8]).toBe("function");
+expect(inst[9]).toBe(15);
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/computed/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/computed/input.js
new file mode 100644
index 0000000000..0e777063a2
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/computed/input.js
@@ -0,0 +1,25 @@
+const foo = "foo";
+const bar = () => {};
+const four = 4;
+
+class MyClass {
+  static [one()] = "test";
+  static [2 * 4 + 7] = "247";
+  static [2 * four + 7] = "247";
+  static [2 * four + seven] = "247";
+  [null] = "null";
+  [undefined] = "undefined";
+  [void 0] = "void 0";
+  get ["whatever"]() {}
+  set ["whatever"](value) {}
+  get [computed()]() {}
+  set [computed()](value) {}
+  ["test" + one]() {}
+  static [10]() {}
+  [/regex/] = "regex";
+  [foo] = "foo";
+  [bar] = "bar";
+  [baz] = "baz";
+  [`template`] = "template";
+  [`template${expression}`] = "template-with-expression";
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/computed/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/computed/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/computed/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/computed/output.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/constructor-collision/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/constructor-collision/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/constructor-collision/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/constructor-collision/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/constructor-collision/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/constructor-collision/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/constructor-collision/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/constructor-collision/output.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/derived/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/derived/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/derived/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/derived/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/derived/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/derived/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/derived/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/derived/output.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/foobar/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/foobar/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/foobar/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/foobar/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/foobar/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/foobar/options.json
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/foobar/options.json
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/foobar/options.json
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/foobar/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/foobar/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/foobar/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/foobar/output.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/instance-computed/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/instance-computed/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/instance-computed/exec.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/instance-computed/exec.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/instance-computed/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/instance-computed/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/instance-computed/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/instance-computed/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/instance-computed/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/instance-computed/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/instance-computed/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/instance-computed/output.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/instance-undefined/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/instance-undefined/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/instance-undefined/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/instance-undefined/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/instance-undefined/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/instance-undefined/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/instance-undefined/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/instance-undefined/output.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/instance/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/instance/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/instance/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/instance/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/instance/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/instance/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/instance/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/instance/output.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/non-block-arrow-func/input.mjs b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/non-block-arrow-func/input.mjs
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/non-block-arrow-func/input.mjs
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/non-block-arrow-func/input.mjs
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/non-block-arrow-func/output.mjs b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/non-block-arrow-func/output.mjs
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/non-block-arrow-func/output.mjs
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/non-block-arrow-func/output.mjs
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/options.json
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/options.json
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/options.json
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/regression-T2983/input.mjs b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/regression-T2983/input.mjs
new file mode 100644
index 0000000000..2961c9a403
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/regression-T2983/input.mjs
@@ -0,0 +1,7 @@
+call(class {
+  static test = true
+});
+
+export default class {
+  static test = true
+};
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/regression-T2983/output.mjs b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/regression-T2983/output.mjs
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/regression-T2983/output.mjs
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/regression-T2983/output.mjs
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/regression-T6719/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/regression-T6719/input.js
new file mode 100644
index 0000000000..38b9e80bae
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/regression-T6719/input.js
@@ -0,0 +1,14 @@
+function withContext(ComposedComponent) {
+    return class WithContext extends Component {
+
+        static propTypes = {
+            context: PropTypes.shape(
+                {
+                    addCss: PropTypes.func,
+                    setTitle: PropTypes.func,
+                    setMeta: PropTypes.func,
+                }
+            ),
+        };
+    };
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/regression-T6719/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/regression-T6719/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/regression-T6719/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/regression-T6719/output.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/regression-T7364/input.mjs b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/regression-T7364/input.mjs
new file mode 100644
index 0000000000..1ddb4a1e78
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/regression-T7364/input.mjs
@@ -0,0 +1,17 @@
+class MyClass {
+  myAsyncMethod = async () => {
+    console.log(this);
+  }
+}
+
+(class MyClass2 {
+  myAsyncMethod = async () => {
+    console.log(this);
+  }
+})
+
+export default class MyClass3 {
+  myAsyncMethod = async () => {
+    console.log(this);
+  }
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/regression-T7364/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/regression-T7364/options.json
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/regression-T7364/options.json
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/regression-T7364/options.json
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/regression-T7364/output.mjs b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/regression-T7364/output.mjs
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/regression-T7364/output.mjs
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/regression-T7364/output.mjs
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/static-export/input.mjs b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-export/input.mjs
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/static-export/input.mjs
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-export/input.mjs
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/static-export/output.mjs b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-export/output.mjs
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/static-export/output.mjs
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-export/output.mjs
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/static-infer-name/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-infer-name/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/static-infer-name/exec.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-infer-name/exec.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/static-infer-name/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-infer-name/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/static-infer-name/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-infer-name/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/static-infer-name/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-infer-name/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/static-infer-name/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-infer-name/output.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/static-undefined/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-undefined/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/static-undefined/exec.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-undefined/exec.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/static-undefined/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-undefined/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/static-undefined/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-undefined/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/static-undefined/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-undefined/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/static-undefined/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/static-undefined/output.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/static/exec.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static/exec.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/static/exec.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/static/exec.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/static/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/static/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/static/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/static/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/static/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/static/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/static/output.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-call/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-call/input.js
new file mode 100644
index 0000000000..175fc704e7
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-call/input.js
@@ -0,0 +1,9 @@
+class A {
+  foo() {
+    return "bar";
+  }
+}
+
+class B extends A {
+  foo = super.foo();
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/super-call/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-call/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/super-call/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-call/output.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/super-expression/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-expression/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/super-expression/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-expression/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/super-expression/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-expression/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/super-expression/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-expression/output.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/loose/super-statement/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-statement/input.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/loose/super-statement/input.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-statement/input.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/super-statement/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-statement/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/super-statement/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-statement/output.js
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-with-collision/input.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-with-collision/input.js
new file mode 100644
index 0000000000..a9552f3068
--- /dev/null
+++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-with-collision/input.js
@@ -0,0 +1,6 @@
+class A {
+  force = force;
+  foo = super.method();
+
+  constructor(force) {}
+}
diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/general/super-with-collision/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-with-collision/output.js
similarity index 100%
rename from packages/babel-plugin-proposal-class-properties/test/fixtures/general/super-with-collision/output.js
rename to packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-with-collision/output.js