diff --git a/.babelrc b/.babelrc
index 574b26a8b..f09ed6950 100644
--- a/.babelrc
+++ b/.babelrc
@@ -14,5 +14,12 @@
     ],
     "stage-0",
     "react"
-  ]
+  ],
+  "env": {
+    "test": {
+      "plugins": [
+        "transform-es2015-modules-commonjs"
+      ]
+    }
+  }
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index ad42f39fe..21c4d5ef0 100644
--- a/package.json
+++ b/package.json
@@ -25,10 +25,10 @@
     "dev": "grunt dev",
     "dist": "grunt dist",
     "prepublish": "grunt dist",
-    "test": "zuul -- test/**/*.test.js",
-    "test:browser": "zuul --local 8080 --disable-tunnel -- test/**/*.test.js",
-    "test:cli": "mochify --extension=.jsx --transform=babelify test/**/*.test.js",
-    "test:watch": "mochify --watch --extension=.jsx --transform=babelify test/**/*.test.js",
+    "test": "cross-env BABEL_ENV=test zuul -- test/**/*.test.js",
+    "test:browser": "cross-env BABEL_ENV=test zuul --local 8080 --disable-tunnel -- test/**/*.test.js",
+    "test:cli": "cross-env BABEL_ENV=test mochify --extension=.jsx --transform=babelify test/**/*.test.js",
+    "test:watch": "cross-env BABEL_ENV=test mochify --watch --extension=.jsx --transform=babelify test/**/*.test.js",
     "test:jest": "jest --coverage",
     "test:jest:watch": "jest --watch --coverage",
     "publish:cdn": "ccu",
@@ -47,9 +47,10 @@
     "babelify": "^7.2.0",
     "bump-version": "^0.5.0",
     "component-cdn-uploader": "auth0/component-cdn-uploader#1.1.0",
+    "cross-env": "^3.1.4",
     "css-loader": "^0.26.1",
-    "enzyme": "2.7.0",
     "dotenv": "^4.0.0",
+    "enzyme": "2.7.0",
     "eslint": "3.7.1",
     "eslint-config-auth0-base": "6.0.0",
     "eslint-plugin-import": "1.16.0",