diff --git a/spec/unit/crypto/DeviceList.spec.js b/spec/unit/crypto/DeviceList.spec.js
index f86cbd1c5..170bc0cb6 100644
--- a/spec/unit/crypto/DeviceList.spec.js
+++ b/spec/unit/crypto/DeviceList.spec.js
@@ -20,8 +20,6 @@ import MemoryCryptoStore from '../../../lib/crypto/store/memory-crypto-store.js'
 import utils from '../../../lib/utils';
 import logger from '../../../src/logger';
 
-import Promise from 'bluebird';
-
 const signedDeviceList = {
     "failures": {},
     "device_keys": {
diff --git a/src/http-api.js b/src/http-api.js
index 4babe9f51..d863c8154 100644
--- a/src/http-api.js
+++ b/src/http-api.js
@@ -256,7 +256,7 @@ module.exports.MatrixHttpApi.prototype = {
         }
 
         if (global.XMLHttpRequest) {
-            const defer = Promise.defer();
+            const defer = utils.defer();
             const xhr = new global.XMLHttpRequest();
             upload.xhr = xhr;
             const cb = requestCallback(defer, opts.callback, this.opts.onlyData);
@@ -418,7 +418,7 @@ module.exports.MatrixHttpApi.prototype = {
             opts.headers['Authorization'] = `Bearer ${accessToken}`;
         }
 
-        const defer = Promise.defer();
+        const defer = utils.defer();
         this.opts.request(
             opts,
             requestCallback(defer, callback, this.opts.onlyData),
@@ -682,7 +682,7 @@ module.exports.MatrixHttpApi.prototype = {
             }
         }
 
-        const defer = Promise.defer();
+        const defer = utils.defer();
 
         let timeoutId;
         let timedOut = false;
diff --git a/src/scheduler.js b/src/scheduler.js
index 1b8d46f67..e69bfb270 100644
--- a/src/scheduler.js
+++ b/src/scheduler.js
@@ -121,7 +121,7 @@ MatrixScheduler.prototype.queueEvent = function(event) {
     if (!this._queues[queueName]) {
         this._queues[queueName] = [];
     }
-    const defer = Promise.defer();
+    const defer = utils.defer();
     this._queues[queueName].push({
         event: event,
         defer: defer,
diff --git a/src/sync.js b/src/sync.js
index a5e1ab12c..9a7bbc2aa 100644
--- a/src/sync.js
+++ b/src/sync.js
@@ -1383,7 +1383,7 @@ SyncApi.prototype._startKeepAlives = function(delay) {
         self._pokeKeepAlive();
     }
     if (!this._connectionReturnedDefer) {
-        this._connectionReturnedDefer = Promise.defer();
+        this._connectionReturnedDefer = utils.defer();
     }
     return this._connectionReturnedDefer.promise;
 };