diff --git a/.babelrc b/.babelrc
index 41d27bf34..6186cefaf 100644
--- a/.babelrc
+++ b/.babelrc
@@ -5,7 +5,6 @@
   ],
   "plugins": [
     "add-module-exports",
-    "transform-async-to-generator",
     "transform-class-properties",
     "transform-decorators-legacy",
     "transform-object-assign",
diff --git a/client/.babelrc b/client/.babelrc
new file mode 100644
index 000000000..27289288c
--- /dev/null
+++ b/client/.babelrc
@@ -0,0 +1,6 @@
+{
+  "extends": "../.babelrc",
+  "plugins": [
+    "transform-async-to-generator",
+  ]
+}
diff --git a/package.json b/package.json
index 7e4c6dfa6..140e9d4e5 100644
--- a/package.json
+++ b/package.json
@@ -165,6 +165,6 @@
     "webpack": "^2.2.1"
   },
   "engines": {
-    "node": ">=7.0.0"
+    "node": ">=7.6.0"
   }
 }
diff --git a/test/mocha.opts b/test/mocha.opts
index 76ca86399..a159ae7aa 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -2,7 +2,6 @@ test/helpers/*.js
 test
 --compilers js:babel-core/register
 --require ignore-styles
---require babel-polyfill
 --recursive
 --colors
 --sort