diff --git a/.jshintrc b/.jshintrc
index 01ac5207..5091d409 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -29,6 +29,8 @@
     "afterEach": true,
     "escape": true,
     "unescape": true,
-    "postMessage": true
+    "postMessage": true,
+    "resolves": true,
+    "rejects": true
   }
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index 738ac62b..ef8c1122 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
     "istanbul": "~0.4.1",
     "mocha": "~2.3.4",
     "rusha": "^0.8.3",
+    "sinon": "^1.17.3",
     "whatwg-fetch": "~0.11.0",
     "zlibjs": "~0.2.0"
   },
diff --git a/test/unittests.js b/test/unittests.js
index 5705bf17..27b5c177 100644
--- a/test/unittests.js
+++ b/test/unittests.js
@@ -1,3 +1,11 @@
+(typeof window !== 'undefined' ? window : global).resolves = function(val) {
+  return new Promise(function(res) { res(val); });
+};
+
+(typeof window !== 'undefined' ? window : global).rejects = function(val) {
+  return new Promise(function(res, rej) { rej(val); });
+};
+
 describe('Unit Tests', function () {
   require('./general');
   require('./crypto');