diff --git a/.jshintrc b/.jshintrc
index 9059707..3686db7 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1,5 +1,5 @@
 {
   "node": true,
   "browser": true,
-  "predef": ["describe", "it", "before", "fetch"]
+  "predef": ["describe", "it", "before"]
 }
diff --git a/package.json b/package.json
index 4bdef1e..bd62e20 100644
--- a/package.json
+++ b/package.json
@@ -19,8 +19,8 @@
   },
   "homepage": "https://github.com/matthew-andrews/node-fetch",
   "dependencies": {
-    "whatwg-fetch": "matthew-andrews/fetch#ie9",
-    "xmlhttprequest": "matthew-andrews/node-XMLHttpRequest"
+    "node-fetch": "^1.0.1",
+    "whatwg-fetch": "matthew-andrews/fetch#ie9"
   },
   "devDependencies": {
     "chai": "^1.10.0",
diff --git a/server.js b/server.js
index 6400a40..a5896be 100644
--- a/server.js
+++ b/server.js
@@ -1,17 +1,9 @@
 "use strict";
 
-global.XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest;
-var noConflictSelf = global.self;
-global.self = {};
-require('whatwg-fetch');
-global.Headers = global.self.Headers;
-global.Request = global.self.Request;
-global.Response = global.self.Response;
-var realFetch = global.self.fetch;
+var realFetch = require('node-fetch');
 module.exports = global.fetch = function(url, options) {
 	if (/^\/\//.test(url)) {
 		url = 'https:' + url;
 	}
 	return realFetch.call(this, url, options);
 };
-global.self = noConflictSelf;
diff --git a/test/api.test.js b/test/api.test.js
index b87fb03..4d59d34 100644
--- a/test/api.test.js
+++ b/test/api.test.js
@@ -1,3 +1,4 @@
+/*global fetch*/
 "use strict";
 
 require('es6-promise').polyfill();