diff --git a/js/profile-w3c-common.js b/js/profile-w3c-common.js
index 500f4cf8fe..f342c6c95e 100644
--- a/js/profile-w3c-common.js
+++ b/js/profile-w3c-common.js
@@ -9,10 +9,9 @@ require.config({
   paths: {
     "handlebars": "/node_modules/handlebars/dist/handlebars",
     "jquery": "/node_modules/jquery/dist/jquery",
-    "Promise": "/node_modules/promise-polyfill/Promise",
     "webidl2": "/node_modules/webidl2/lib/webidl2",
   },
-  deps: ["core/jquery-enhanced", "Promise"]
+  deps: ["core/jquery-enhanced"]
 });
 
 define([
diff --git a/karma.conf.js b/karma.conf.js
index dca18aece9..2cf723fa5e 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -20,7 +20,7 @@ module.exports = function(config) {
 
     // configuration
     detectBrowsers: {
-      enabled: true,
+      enabled: false,
       usePhantomJS: false,
       postDetection: function(browsers) {
         return browsers;
@@ -52,10 +52,6 @@ module.exports = function(config) {
         pattern: "node_modules/requirejs/require.js",
         included: false,
         served: true,
-      }, {
-        pattern: "node_modules/promise-polyfill/Promise.js",
-        included: false,
-        served: true,
       }, {
         pattern: "node_modules/jquery/dist/jquery.js",
         included: true,
@@ -115,7 +111,7 @@ module.exports = function(config) {
 
 
     // See "detectBrowsers"
-    browsers: ["Chrome", "Safari", "Chrome"],
+    browsers: ["Safari"],
 
     // Continuous Integration mode
     // if true, Karma captures browsers, runs the tests and exits
diff --git a/package.json b/package.json
index 55aad470ec..18069a9895 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,6 @@
     "moment": "^2.11.2",
     "mozilla-download": "^1.1.1",
     "phantomjs-prebuilt": "^2.1.4",
-    "promise-polyfill": "^3.1.0",
     "prompt": "^1.0.0",
     "requirejs": "^2.1.22",
     "webidl2": "^2.0.11"
diff --git a/tools/builder.js b/tools/builder.js
index 9840e69123..e20f80273e 100755
--- a/tools/builder.js
+++ b/tools/builder.js
@@ -84,7 +84,6 @@ var Builder = {
         paths: {
           "require": "../node_modules/requirejs/require",
           "jquery": "../node_modules/jquery/dist/jquery",
-          "Promise": "../node_modules/promise-polyfill/Promise",
           "handlebars": "../node_modules/handlebars/dist/handlebars",
           "webidl2": "../node_modules/webidl2/lib/webidl2",
         },
@@ -97,7 +96,6 @@ var Builder = {
         include: [
           "../node_modules/requirejs/require",
           "../node_modules/jquery/dist/jquery",
-          "../node_modules/promise-polyfill/Promise",
           "../node_modules/handlebars/dist/handlebars",
           "../node_modules/webidl2/lib/webidl2",
         ],