diff --git a/package.json b/package.json
index 0cf263a..ca2b81d 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "babel-register": "^6.5.2",
     "chai": "^3.5.0",
     "chai-dom": "^1.4.0",
-    "es6-promise": "^3.1.2",
+    "es6-promise": "^4.0.5",
     "gulp": "gulpjs/gulp.git#4.0",
     "gulp-mocha-phantomjs": "^0.12.0",
     "gulp-postcss": "^6.1.0",
diff --git a/test/runner.html b/test/runner.html
index ba99774..2379b41 100644
--- a/test/runner.html
+++ b/test/runner.html
@@ -8,8 +8,7 @@
   <div id="mocha"></div>
 
   <!-- Polyfills -->
-  <script src="../node_modules/es6-promise/dist/es6-promise.min.js"></script>
-  <script>ES6Promise.polyfill();</script>
+  <script src="../node_modules/es6-promise/dist/es6-promise.auto.min.js"></script>
 
   <!-- Testing Framework -->
   <script src="../node_modules/mocha/mocha.js"></script>