diff --git a/.aegir.js b/.aegir.js
new file mode 100644
index 00000000..e3151abe
--- /dev/null
+++ b/.aegir.js
@@ -0,0 +1,16 @@
+'use strict'
+
+const path = require('path')
+
+module.exports = {
+  webpack: {
+    resolve: {
+      alias: {
+        'node-forge': path.resolve(
+          path.dirname(require.resolve('libp2p-crypto')),
+          '../vendor/forge.bundle.js'
+        )
+      }
+    }
+  }
+}
diff --git a/package.json b/package.json
index 2a369ada..589164d0 100644
--- a/package.json
+++ b/package.json
@@ -34,19 +34,19 @@
   "homepage": "https://github.com/ipfs/js-ipfs-bitswap#readme",
   "devDependencies": {
     "abstract-blob-store": "^3.2.0",
-    "aegir": "^3.0.1",
+    "aegir": "^3.1.0",
     "buffer-loader": "0.0.1",
     "chai": "^3.5.0",
     "fs-blob-store": "^5.2.1",
     "idb-plus-blob-store": "^1.1.2",
     "ipfs-repo": "^0.8.0",
-    "libp2p-ipfs": "^0.3.6",
+    "libp2p-ipfs": "^0.9.0",
     "lodash": "^4.11.2",
-    "multiaddr": "^1.4.1",
+    "multiaddr": "^2.0.2",
     "ncp": "^2.0.0",
-    "peer-book": "^0.1.0",
-    "peer-id": "^0.6.6",
-    "peer-info": "^0.6.2",
+    "peer-book": "^0.3.0",
+    "peer-id": "^0.7.0",
+    "peer-info": "^0.7.0",
     "rimraf": "^2.5.2"
   },
   "dependencies": {
@@ -59,15 +59,6 @@
     "lodash.isundefined": "^3.0.1",
     "protocol-buffers": "^3.1.6"
   },
-  "aegir": {
-    "webpack": {
-      "resolve": {
-        "alias": {
-          "node-forge": "../../../node_modules/peer-id/vendor/forge.bundle.js"
-        }
-      }
-    }
-  },
   "contributors": [
     "David Dias <daviddias.p@gmail.com>",
     "Friedel Ziegelmayer <dignifiedquire@gmail.com>"
diff --git a/test/utils.js b/test/utils.js
index bcc81a9e..3c459795 100644
--- a/test/utils.js
+++ b/test/utils.js
@@ -101,7 +101,7 @@ exports.genBitswapNetwork = (n, callback) => {
   _.range(n).forEach((i) => {
     const p = new PeerInfo()
     const mh1 = multiaddr('/ip4/127.0.0.1/tcp/' + (basePort + i))
-    const mh2 = multiaddr('/ip4/127.0.0.1/tcp/' + (basePort + i + 2000) + '/websockets')
+    const mh2 = multiaddr('/ip4/127.0.0.1/tcp/' + (basePort + i + 2000) + '/ws')
 
     p.multiaddr.add(mh1)
     p.multiaddr.add(mh2)