diff --git a/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/loose/accessors/actual.js b/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/loose/accessors/actual.js
new file mode 100644
index 0000000000..c12d2a7f2a
--- /dev/null
+++ b/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/loose/accessors/actual.js
@@ -0,0 +1,14 @@
+var obj = {
+  get [foobar]() {
+    return "foobar";
+  },
+  set [foobar](x) {
+    console.log(x);
+  },
+  get test() {
+    return "regular getter after computed property";
+  },
+  set "test"(x) {
+    console.log(x);
+  }
+};
diff --git a/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/loose/accessors/expected.js b/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/loose/accessors/expected.js
new file mode 100644
index 0000000000..46104c06f9
--- /dev/null
+++ b/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/loose/accessors/expected.js
@@ -0,0 +1,11 @@
+var _foobar, _foobar2, _test, _test2, _obj, _mutatorMap;
+
+var obj = (_obj = {}, _foobar = foobar, _mutatorMap = {}, _mutatorMap[_foobar] = _mutatorMap[_foobar] || {}, _mutatorMap[_foobar].get = function () {
+  return "foobar";
+}, _foobar2 = foobar, _mutatorMap[_foobar2] = _mutatorMap[_foobar2] || {}, _mutatorMap[_foobar2].set = function (x) {
+  console.log(x);
+}, _test = "test", _mutatorMap[_test] = _mutatorMap[_test] || {}, _mutatorMap[_test].get = function () {
+  return "regular getter after computed property";
+}, _test2 = "test", _mutatorMap[_test2] = _mutatorMap[_test2] || {}, _mutatorMap[_test2].set = function (x) {
+  console.log(x);
+}, babelHelpers.defineEnumerableProperties(_obj, _mutatorMap), _obj);
diff --git a/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/loose/method/actual.js b/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/loose/method/actual.js
index 068edebd55..f4d7c72c4e 100644
--- a/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/loose/method/actual.js
+++ b/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/loose/method/actual.js
@@ -1,5 +1,8 @@
 var obj = {
   [foobar]() {
     return "foobar";
+  },
+  test() {
+    return "regular method after computed property";
   }
 };
diff --git a/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/loose/method/expected.js b/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/loose/method/expected.js
index b4a01454cd..b8fd0e52e7 100644
--- a/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/loose/method/expected.js
+++ b/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/loose/method/expected.js
@@ -2,4 +2,6 @@ var _obj;
 
 var obj = (_obj = {}, _obj[foobar] = function () {
   return "foobar";
+}, _obj.test = function () {
+  return "regular method after computed property";
 }, _obj);
diff --git a/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/spec/accessors/actual.js b/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/spec/accessors/actual.js
new file mode 100644
index 0000000000..c12d2a7f2a
--- /dev/null
+++ b/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/spec/accessors/actual.js
@@ -0,0 +1,14 @@
+var obj = {
+  get [foobar]() {
+    return "foobar";
+  },
+  set [foobar](x) {
+    console.log(x);
+  },
+  get test() {
+    return "regular getter after computed property";
+  },
+  set "test"(x) {
+    console.log(x);
+  }
+};
diff --git a/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/spec/accessors/expected.js b/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/spec/accessors/expected.js
new file mode 100644
index 0000000000..46104c06f9
--- /dev/null
+++ b/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/spec/accessors/expected.js
@@ -0,0 +1,11 @@
+var _foobar, _foobar2, _test, _test2, _obj, _mutatorMap;
+
+var obj = (_obj = {}, _foobar = foobar, _mutatorMap = {}, _mutatorMap[_foobar] = _mutatorMap[_foobar] || {}, _mutatorMap[_foobar].get = function () {
+  return "foobar";
+}, _foobar2 = foobar, _mutatorMap[_foobar2] = _mutatorMap[_foobar2] || {}, _mutatorMap[_foobar2].set = function (x) {
+  console.log(x);
+}, _test = "test", _mutatorMap[_test] = _mutatorMap[_test] || {}, _mutatorMap[_test].get = function () {
+  return "regular getter after computed property";
+}, _test2 = "test", _mutatorMap[_test2] = _mutatorMap[_test2] || {}, _mutatorMap[_test2].set = function (x) {
+  console.log(x);
+}, babelHelpers.defineEnumerableProperties(_obj, _mutatorMap), _obj);
diff --git a/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/spec/method/actual.js b/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/spec/method/actual.js
index 068edebd55..f4d7c72c4e 100644
--- a/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/spec/method/actual.js
+++ b/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/spec/method/actual.js
@@ -1,5 +1,8 @@
 var obj = {
   [foobar]() {
     return "foobar";
+  },
+  test() {
+    return "regular method after computed property";
   }
 };
diff --git a/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/spec/method/expected.js b/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/spec/method/expected.js
index 7388f306b9..df0fb2ef13 100644
--- a/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/spec/method/expected.js
+++ b/packages/babel-plugin-transform-es2015-computed-properties/test/fixtures/spec/method/expected.js
@@ -1,3 +1,7 @@
-var obj = babelHelpers.defineProperty({}, foobar, function () {
+var _obj;
+
+var obj = (_obj = {}, babelHelpers.defineProperty(_obj, foobar, function () {
   return "foobar";
-});
+}), babelHelpers.defineProperty(_obj, "test", function () {
+  return "regular method after computed property";
+}), _obj);