diff --git a/lib/MiddlewareContext.js b/lib/MiddlewareContext.js
index b86b8b4..72a6a6c 100644
--- a/lib/MiddlewareContext.js
+++ b/lib/MiddlewareContext.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var nJwt = require('njwt');
-var uuid = require('node-uuid');
+var uuid = require('uuid');
 var stormpath = require('stormpath');
 
 var pkg = require('../package.json');
diff --git a/package.json b/package.json
index a16324e..ab7cbb9 100644
--- a/package.json
+++ b/package.json
@@ -40,11 +40,11 @@
     "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --timeout=5000 --reporter dot --check-leaks test/"
   },
   "dependencies": {
-    "node-uuid": "^1.4.2",
-    "stormpath": "^0.9.0",
-    "njwt": "0.0.1",
     "async": "^0.9.0",
-    "underscore": "^1.8.2"
+    "njwt": "0.0.1",
+    "stormpath": "^0.9.0",
+    "underscore": "^1.8.2",
+    "uuid": "^3.0.0"
   },
   "devDependencies": {
     "mocha": "^2.1.0",
diff --git a/test/authenticate.js b/test/authenticate.js
index 3fc45ea..f836996 100644
--- a/test/authenticate.js
+++ b/test/authenticate.js
@@ -2,7 +2,7 @@ var bodyParser = require('body-parser');
 var cookieParser = require('cookie-parser');
 var express = require('express');
 var request = require('supertest');
-var uuid = require('node-uuid');
+var uuid = require('uuid');
 
 var loginSuccessFixture = require('./fixtures/loginSuccess');
 var mockLoginPost = {username:'abc',password:'123'};
diff --git a/test/fixtures/loginSuccess.js b/test/fixtures/loginSuccess.js
index 2f8fc23..a0ac9ea 100644
--- a/test/fixtures/loginSuccess.js
+++ b/test/fixtures/loginSuccess.js
@@ -8,7 +8,7 @@
 var bodyParser = require('body-parser');
 var express = require('express');
 var http = require('http');
-var uuid = require('node-uuid');
+var uuid = require('uuid');
 
 function loginSuccessFixture2(done){
   var app = express();