diff --git a/.babelrc b/.babelrc
index 15d27ad9..65836a67 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,4 +1,3 @@
 {
-  "stage": 0,
-  "loose": "all"
+  "presets": ["es2015-loose", "stage-0", "react"]
 }
diff --git a/examples/counter/.babelrc b/examples/counter/.babelrc
index b0b9a96e..65836a67 100644
--- a/examples/counter/.babelrc
+++ b/examples/counter/.babelrc
@@ -1,3 +1,3 @@
 {
-  "stage": 0
+  "presets": ["es2015-loose", "stage-0", "react"]
 }
diff --git a/examples/counter/package.json b/examples/counter/package.json
index 5ed329b8..ca9c6a67 100644
--- a/examples/counter/package.json
+++ b/examples/counter/package.json
@@ -23,8 +23,12 @@
     "redux-thunk": "^1.0.0"
   },
   "devDependencies": {
-    "babel-core": "^5.6.18",
-    "babel-loader": "^5.1.4",
+    "babel-cli": "^6.3.17",
+    "babel-core": "^6.3.17",
+    "babel-loader": "^6.2.0",
+    "babel-preset-es2015-loose": "^6.1.3",
+    "babel-preset-react": "6.3.13",
+    "babel-preset-stage-0": "^6.3.13",
     "node-libs-browser": "^0.5.2",
     "react-hot-loader": "^1.3.0",
     "redux-devtools": "^3.0.0",
diff --git a/examples/todomvc/.babelrc b/examples/todomvc/.babelrc
index b0b9a96e..65836a67 100644
--- a/examples/todomvc/.babelrc
+++ b/examples/todomvc/.babelrc
@@ -1,3 +1,3 @@
 {
-  "stage": 0
+  "presets": ["es2015-loose", "stage-0", "react"]
 }
diff --git a/examples/todomvc/package.json b/examples/todomvc/package.json
index 8bf28047..e5fe41fd 100644
--- a/examples/todomvc/package.json
+++ b/examples/todomvc/package.json
@@ -35,8 +35,12 @@
     "redux": "^3.0.0"
   },
   "devDependencies": {
-    "babel-core": "^5.6.18",
-    "babel-loader": "^5.1.4",
+    "babel-cli": "^6.3.17",
+    "babel-core": "^6.3.17",
+    "babel-loader": "^6.2.0",
+    "babel-preset-es2015-loose": "^6.1.3",
+    "babel-preset-react": "6.3.13",
+    "babel-preset-stage-0": "^6.3.13",
     "node-libs-browser": "^0.5.2",
     "raw-loader": "^0.5.1",
     "react-hot-loader": "^1.3.0",
diff --git a/package.json b/package.json
index 05141913..9894f61b 100644
--- a/package.json
+++ b/package.json
@@ -7,8 +7,8 @@
     "clean": "rimraf lib",
     "build": "babel src --out-dir lib",
     "lint": "eslint src test examples",
-    "test": "NODE_ENV=test mocha --compilers js:babel/register --recursive",
-    "test:watch": "NODE_ENV=test mocha --compilers js:babel/register --recursive --watch",
+    "test": "NODE_ENV=test mocha --compilers js:babel-core/register --recursive",
+    "test:watch": "NODE_ENV=test mocha --compilers js:babel-core/register --recursive --watch",
     "test:cov": "babel-node ./node_modules/.bin/isparta cover ./node_modules/.bin/_mocha -- --recursive",
     "prepublish": "npm run lint && npm run test && npm run clean && npm run build"
   },
@@ -31,10 +31,13 @@
   },
   "homepage": "https://github.com/gaearon/redux-devtools",
   "devDependencies": {
-    "babel": "^5.5.8",
-    "babel-core": "^5.6.18",
-    "babel-eslint": "^3.1.15",
-    "babel-loader": "^5.1.4",
+    "babel-cli": "^6.3.17",
+    "babel-core": "^6.3.17",
+    "babel-eslint": "^4.1.6",
+    "babel-loader": "^6.2.0",
+    "babel-preset-es2015-loose": "^6.1.3",
+    "babel-preset-react": "6.3.13",
+    "babel-preset-stage-0": "^6.3.13",
     "eslint": "^0.23",
     "eslint-config-airbnb": "0.0.6",
     "eslint-plugin-react": "^2.3.0",
diff --git a/src/createDevTools.js b/src/createDevTools.js
index 0541fc46..1932c7c6 100644
--- a/src/createDevTools.js
+++ b/src/createDevTools.js
@@ -11,7 +11,7 @@ export default function createDevTools(children) {
     Monitor.update(monitorProps, state, action)
   );
 
-  return class DevTools extends Component {
+  class DevTools extends Component {
     static contextTypes = {
       store: PropTypes.object
     };
@@ -37,6 +37,7 @@ export default function createDevTools(children) {
                           store={this.liftedStore} />
       );
     }
-  };
-}
+  }
 
+  return DevTools;
+}