diff --git a/lib/bunyan_helper.js b/lib/bunyan_helper.js
index 30c4ad4b3..9b8535398 100644
--- a/lib/bunyan_helper.js
+++ b/lib/bunyan_helper.js
@@ -8,7 +8,7 @@ var util = require('util');
 var assert = require('assert-plus');
 var bunyan = require('bunyan');
 var LRU = require('lru-cache');
-var uuid = require('node-uuid');
+var uuid = require('uuid');
 
 
 ///--- Globals
diff --git a/lib/request.js b/lib/request.js
index 2850f8097..52cd74e1a 100644
--- a/lib/request.js
+++ b/lib/request.js
@@ -9,7 +9,7 @@ var sprintf = require('util').format;
 var assert = require('assert-plus');
 var mime = require('mime');
 var Negotatior = require('negotiator');
-var uuid = require('node-uuid');
+var uuid = require('uuid');
 
 var dtrace = require('./dtrace');
 
diff --git a/lib/server.js b/lib/server.js
index 0d7351285..1609ba851 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -14,7 +14,7 @@ var mime = require('mime');
 var once = require('once');
 var semver = require('semver');
 var spdy = require('spdy');
-var uuid = require('node-uuid');
+var uuid = require('uuid');
 var vasync = require('vasync');
 
 var dtrace = require('./dtrace');
diff --git a/package.json b/package.json
index b0eb854fb..d0e186ec8 100644
--- a/package.json
+++ b/package.json
@@ -68,12 +68,12 @@
     "lru-cache": "^4.0.1",
     "mime": "^1.2.11",
     "negotiator": "^0.6.1",
-    "node-uuid": "^1.4.7",
     "once": "^1.3.0",
     "qs": "^6.2.1",
     "restify-errors": "^4.2.3",
     "semver": "^5.0.1",
     "spdy": "^3.3.3",
+    "uuid": "^3.0.0",
     "vasync": "^1.6.4"
   },
   "optionalDependencies": {
diff --git a/test/server.test.js b/test/server.test.js
index eb987f2ee..61ac7ec48 100644
--- a/test/server.test.js
+++ b/test/server.test.js
@@ -12,7 +12,7 @@ var errors = require('restify-errors');
 var filed = require('filed');
 var plugins = require('restify-plugins');
 var restifyClients = require('restify-clients');
-var uuid = require('node-uuid');
+var uuid = require('uuid');
 var validator = require('validator');
 
 var RestError = errors.RestError;
@@ -1782,7 +1782,7 @@ test('error handler defers "after" event', function (t) {
         // do not fire prematurely
         t.notOk(true);
     });
-    CLIENT.get('/' + uuid(), function (err, _, res) {
+    CLIENT.get('/' + uuid.v4(), function (err, _, res) {
         t.ok(err);
         t.equal(res.statusCode, 404);
         t.end();