diff --git a/packages/babel-core/test/fixtures/esnext/es6-computed-properties/options.json b/packages/babel-core/test/fixtures/esnext/es6-computed-properties/options.json
index ed96b856f3..4e7289fa9f 100644
--- a/packages/babel-core/test/fixtures/esnext/es6-computed-properties/options.json
+++ b/packages/babel-core/test/fixtures/esnext/es6-computed-properties/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["transform-es2015-computed-properties"]
+  "plugins": ["transform-es2015-computed-properties", "transform-es5-property-mutators"]
 }
diff --git a/packages/babel-core/test/fixtures/esnext/es6-object-concise/options.json b/packages/babel-core/test/fixtures/esnext/es6-object-concise/options.json
new file mode 100644
index 0000000000..2a70365d39
--- /dev/null
+++ b/packages/babel-core/test/fixtures/esnext/es6-object-concise/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["transform-es2015-shorthand-properties", "transform-es2015-function-name"]
+}
diff --git a/packages/babel-core/test/fixtures/esnext/es6-spread/options.json b/packages/babel-core/test/fixtures/esnext/es6-spread/options.json
index f812157ad7..53ebc8223c 100644
--- a/packages/babel-core/test/fixtures/esnext/es6-spread/options.json
+++ b/packages/babel-core/test/fixtures/esnext/es6-spread/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["transform-es2015-spread", "transform-es2015-parameters"]
+  "plugins": ["transform-es2015-spread", "transform-es2015-parameters", "transform-es2015-computed-properties"]
 }
diff --git a/packages/babel-core/test/fixtures/transformation/es6.block-scoping-pass/options.json b/packages/babel-core/test/fixtures/transformation/es6.block-scoping-pass/options.json
index 599c8d9a01..7c2bea4aad 100644
--- a/packages/babel-core/test/fixtures/transformation/es6.block-scoping-pass/options.json
+++ b/packages/babel-core/test/fixtures/transformation/es6.block-scoping-pass/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["transform-es2015-block-scoping", "transform-es2015-parameters", "transform-es2015-destructuring", "transform-es2015-modules-commonjs"]
+  "plugins": ["transform-es2015-constants", "transform-es2015-block-scoping", "transform-es2015-parameters", "transform-es2015-destructuring", "transform-es2015-modules-commonjs"]
 }
diff --git a/packages/babel-core/test/fixtures/transformation/es6.destructuring/options.json b/packages/babel-core/test/fixtures/transformation/es6.destructuring/options.json
index 492b43d890..eb68cea4fb 100644
--- a/packages/babel-core/test/fixtures/transformation/es6.destructuring/options.json
+++ b/packages/babel-core/test/fixtures/transformation/es6.destructuring/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["external-helpers-2", "transform-es2015-destructuring", "transform-es2015-spread", "transform-es2015-parameters", "transform-es2015-block-scoping", "transform-object-rest-spread"]
+  "plugins": ["external-helpers-2", "transform-es2015-destructuring", "transform-es2015-spread", "transform-es2015-parameters", "transform-es2015-block-scoping", "transform-object-rest-spread", "transform-regenerator"]
 }
diff --git a/packages/babel-core/test/fixtures/transformation/es6.object-super/options.json b/packages/babel-core/test/fixtures/transformation/es6.object-super/options.json
index 717cf43d40..6d40577ee4 100644
--- a/packages/babel-core/test/fixtures/transformation/es6.object-super/options.json
+++ b/packages/babel-core/test/fixtures/transformation/es6.object-super/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["external-helpers-2", "transform-es2015-object-super"]
+  "plugins": ["external-helpers-2", "transform-es2015-object-super", "transform-es2015-shorthand-properties"]
 }
diff --git a/packages/babel-core/test/fixtures/transformation/es6.object-super/statically-bound/expected.js b/packages/babel-core/test/fixtures/transformation/es6.object-super/statically-bound/expected.js
index e2504935dd..9bb61e58e7 100644
--- a/packages/babel-core/test/fixtures/transformation/es6.object-super/statically-bound/expected.js
+++ b/packages/babel-core/test/fixtures/transformation/es6.object-super/statically-bound/expected.js
@@ -1,7 +1,7 @@
 var _obj;
 
 var o = _obj = {
-  m() {
+  m: function () {
     return babelHelpers.get(Object.getPrototypeOf(_obj), "x", this);
   }
 };
diff --git a/packages/babel-core/test/fixtures/transformation/es6.parameters/options.json b/packages/babel-core/test/fixtures/transformation/es6.parameters/options.json
index 0ce23fb256..96315b687a 100644
--- a/packages/babel-core/test/fixtures/transformation/es6.parameters/options.json
+++ b/packages/babel-core/test/fixtures/transformation/es6.parameters/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": ["external-helpers-2", "syntax-flow", "transform-es2015-parameters", "transform-es2015-block-scoping", "transform-es2015-spread", "transform-es2015-classes", "transform-es2015-destructuring", "transform-es2015-arrow-functions", "syntax-async-functions"]
+  "plugins": ["external-helpers-2", "syntax-flow", "transform-es2015-parameters", "transform-es2015-block-scoping", "transform-es2015-spread", "transform-es2015-classes", "transform-es2015-destructuring", "transform-es2015-arrow-functions", "syntax-async-functions", "transform-es2015-for-of"]
 }
diff --git a/packages/babel-core/test/fixtures/transformation/es6.spec.symbols/instanceof/exec.js b/packages/babel-core/test/fixtures/transformation/es6.spec.symbols/instanceof/exec.js
index 7d3514bf96..5220e624d8 100644
--- a/packages/babel-core/test/fixtures/transformation/es6.spec.symbols/instanceof/exec.js
+++ b/packages/babel-core/test/fixtures/transformation/es6.spec.symbols/instanceof/exec.js
@@ -1,4 +1,6 @@
-var foo = { [Symbol.hasInstance]: function () { return true; } };
+var foo = {};
+foo[Symbol.hasInstance]= function () { return true; };
+
 var bar = {};
 
 assert.ok(bar instanceof foo);
diff --git a/packages/babel-core/test/fixtures/transformation/es7.exponentian-operator/memoise-object/exec.js b/packages/babel-core/test/fixtures/transformation/es7.exponentian-operator/memoise-object/exec.js
index 140551313e..aebbf3b5d9 100644
--- a/packages/babel-core/test/fixtures/transformation/es7.exponentian-operator/memoise-object/exec.js
+++ b/packages/babel-core/test/fixtures/transformation/es7.exponentian-operator/memoise-object/exec.js
@@ -1,6 +1,6 @@
 var counters = 0;
 Object.defineProperty(global, "reader", {
-  get() {
+  get: function () {
     counters += 1;
     return { x: 2 };
   },
diff --git a/packages/babel-plugin-transform-es2015-literals/src/index.js b/packages/babel-plugin-transform-es2015-literals/src/index.js
index 371dd7d7cd..27d50a7ff2 100644
--- a/packages/babel-plugin-transform-es2015-literals/src/index.js
+++ b/packages/babel-plugin-transform-es2015-literals/src/index.js
@@ -1,14 +1,14 @@
 export default function () {
   return {
     visitor: {
-      NumberLiteral(node) {
+      NumberLiteral({ node }) {
         // number octal like 0b10 or 0o70
         if (node.extra && /^0[ob]/i.test(node.extra.raw)) {
           node.extra = undefined;
         }
       },
 
-      StringLiteral(node) {
+      StringLiteral({ node }) {
         // unicode escape
         if (node.extra && /\\[u]/gi.test(node.extra.raw)) {
           node.extra = undefined;