diff --git a/index.js b/index.js
index 592d29f..01e16f2 100644
--- a/index.js
+++ b/index.js
@@ -7,7 +7,7 @@
  * MIT Licensed
  *
  */
-var Promise = require('bluebird');
+var when = require('when');
 var request = require('request');
 var _ = require('fg-lodash');
 var RetryStrategies = require('./strategies');
@@ -22,7 +22,7 @@ var DEFAULTS = {
 
 // Default promise factory which use bluebird
 function defaultPromiseFactory(resolver) {
-  return new Promise(resolver);
+  return when.promise(resolver);
 }
 
 /**
diff --git a/package.json b/package.json
index 40c8ee6..1857ddd 100644
--- a/package.json
+++ b/package.json
@@ -22,9 +22,9 @@
   },
   "license": "MIT",
   "dependencies": {
-    "bluebird": "~3.0.5",
     "fg-lodash": "0.0.2",
-    "request": "^2.62.x"
+    "request": "^2.62.x",
+    "when": "~3.7.5"
   },
   "devDependencies": {
     "chai": "^3.2.0",
@@ -33,6 +33,6 @@
     "nock": "~3.1.0",
     "q": "~1.4.1",
     "rsvp": "~3.1.0",
-    "when": "~3.7.5"
+    "bluebird": "~3.0.5"
   }
 }
diff --git a/test/promises.test.js b/test/promises.test.js
index b15d4cd..adc68b1 100644
--- a/test/promises.test.js
+++ b/test/promises.test.js
@@ -113,9 +113,10 @@ describe('Promises support', function () {
       });
     }
 
-    describe('Using when.js', function () {
+    describe('Using bluebird', function () {
+      var Promise = require('bluebird');
       function customPromiseFactory(resolver) {
-        return require('when').promise(resolver);
+        return new Promise(resolver);
       }
 
       it('should work on request success', function (done) {