diff --git a/osprey-mock-service.js b/osprey-mock-service.js
index de261c5..8b3bef8 100644
--- a/osprey-mock-service.js
+++ b/osprey-mock-service.js
@@ -1,6 +1,6 @@
-var router = require('osprey-router')
 var Negotiator = require('negotiator')
 var resources = require('osprey-resources')
+var osprey = require('osprey')
 
 /**
  * Export the mock server.
@@ -28,10 +28,9 @@ function ospreyMockServer (raml) {
  * @return {Function}
  */
 function createServer (raml, options) {
-  var osprey = require('osprey')
-  var app = router()
+  var app = osprey.Router()
 
-  app.use(osprey.createServer(raml, options))
+  app.use(osprey.server(raml, options))
   app.use(ospreyMockServer(raml))
 
   return app
@@ -45,7 +44,7 @@ function createServer (raml, options) {
  * @return {Function}
  */
 function createServerFromBaseUri (raml, options) {
-  var app = router()
+  var app = osprey.Router()
   var path = (raml.baseUri || '').replace(/^(\w+:)?\/\/[^\/]+/, '') || '/'
 
   app.use(path, createServer(raml, options))
diff --git a/package.json b/package.json
index 32343b2..0670b05 100644
--- a/package.json
+++ b/package.json
@@ -45,9 +45,8 @@
   "dependencies": {
     "finalhandler": "^0.4.0",
     "negotiator": "^0.5.1",
-    "osprey": "^0.2.0-alpha",
+    "osprey": "^0.2.0-beta.3",
     "osprey-resources": "^0.3.0",
-    "osprey-router": "^0.1.0",
     "raml-parser": "^0.8.10",
     "yargs": "^3.5.4"
   }