diff --git a/karma.conf.js b/karma.conf.js
index c706c56..a7d7cd6 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -16,7 +16,6 @@ module.exports = function(config) {
     // list of files / patterns to load in the browser
     files: [
       'dist/axios.js',
-      'node_modules/es6-promise/dist/promise-1.0.0.js',
       'test/specs/**/*.spec.js'
     ],
 
diff --git a/lib/axios.js b/lib/axios.js
index 10e0c80..0e92518 100644
--- a/lib/axios.js
+++ b/lib/axios.js
@@ -1,10 +1,12 @@
-var Promise = require('es6-promise').Promise;
 var defaults = require('./defaults');
 var utils = require('./utils');
 var deprecatedMethod = require('./helpers/deprecatedMethod');
 var dispatchRequest = require('./core/dispatchRequest');
 var InterceptorManager = require('./core/InterceptorManager');
 
+// Polyfill ES6 Promise if needed
+require('es6-promise').polyfill();
+
 var axios = module.exports = function axios(config) {
   config = utils.merge({
     method: 'get',
diff --git a/package.json b/package.json
index b84364c..0b807fb 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
   },
   "homepage": "https://github.com/mzabriskie/axios",
   "dependencies": {
-    "es6-promise": "^1.0.0"
+    "es6-promise": "^2.0.1"
   },
   "devDependencies": {
     "grunt": "^0.4.5",