diff --git a/package.json b/package.json
index 9eeb716..e4f9b7b 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
   "dependencies": {
     "debug": "^2.2.0",
     "feathers-socket-commons": "^2.0.0",
-    "primus": "^5.0.1",
+    "primus": "^6.0.5",
     "primus-emitter": "^3.1.1",
     "uberproto": "^1.2.0"
   },
@@ -75,6 +75,7 @@
     "mocha": "^3.0.0",
     "rimraf": "^2.5.4",
     "semistandard": "^9.1.0",
-    "ws": "^1.0.0"
+    "uws": "^0.11.1",
+    "ws": "^1.1.1"
   }
-}
\ No newline at end of file
+}
diff --git a/src/index.js b/src/index.js
index a2f7952..1b39e87 100644
--- a/src/index.js
+++ b/src/index.js
@@ -22,9 +22,9 @@ export default function (config, configurer) {
         if (!primus) {
           primus = this.primus = new Primus(server, config);
 
-          primus.use('emitter', Emitter);
+          primus.plugin('emitter', Emitter);
 
-          primus.before('feathers', function (req, res, next) {
+          primus.use('feathers', function (req, res, next) {
             req.feathers = { provider: 'primus' };
             next();
           }, 0);
diff --git a/test/client/server.js b/test/client/server.js
index 17a8227..e2b9c41 100644
--- a/test/client/server.js
+++ b/test/client/server.js
@@ -30,7 +30,7 @@ export default function (cb) {
 
   var app = feathers()
     .configure(primus({
-      transformer: 'websockets'
+      transformer: 'uws'
     }, cb))
     .use('/todos', todoService);
 
diff --git a/test/index.test.js b/test/index.test.js
index fe9ad12..38a37e5 100644
--- a/test/index.test.js
+++ b/test/index.test.js
@@ -24,7 +24,7 @@ describe('feathers-primus', () => {
     const app = options.app = feathers()
       .configure(hooks())
       .configure(primus({
-        transformer: 'websockets'
+        transformer: 'uws'
       }, function (primus) {
         options.socket = new primus.Socket('http://localhost:7888');
 
@@ -61,7 +61,7 @@ describe('feathers-primus', () => {
     var counter = 0;
     var app = feathers()
       .configure(primus({
-        transformer: 'websockets'
+        transformer: 'uws'
       }, function () {
         assert.equal(counter, 0);
         counter++;
@@ -142,7 +142,7 @@ describe('feathers-primus', () => {
     let server;
     const sub = feathers()
       .configure(primus({
-        transformer: 'websockets'
+        transformer: 'uws'
       }, function (primus) {
         const socket = new primus.Socket('http://localhost:9876');
 
diff --git a/test/sub-app.js b/test/sub-app.js
index 9e59123..a879412 100644
--- a/test/sub-app.js
+++ b/test/sub-app.js
@@ -18,7 +18,7 @@ function todoService () {
 
 export default function (callback) {
   const options = {
-    transformer: 'websockets'
+    transformer: 'uws'
   };
   const app = feathers().configure(primus(options, primus => callback(primus)));
   const v1 = feathers().configure(primus(options)).use('/todos', todoService());