diff --git a/package.json b/package.json
index 617fa4ac45..e86dbbe1ee 100644
--- a/package.json
+++ b/package.json
@@ -29,21 +29,21 @@
     "async": "^2.5.0",
     "bl": "^1.2.1",
     "bs58": "^4.0.1",
-    "chai": "^4.1.1",
+    "chai": "^4.1.2",
     "cids": "^0.5.1",
     "concat-stream": "^1.6.0",
     "detect-node": "^2.0.3",
     "ipfs-block": "^0.6.0",
     "ipld-dag-cbor": "^0.11.1",
     "ipld-dag-pb": "^0.11.0",
-    "multiaddr": "^2.3.0",
-    "multihashes": "^0.4.8",
+    "multiaddr": "^3.0.0",
+    "multihashes": "^0.4.9",
     "multihashing-async": "^0.4.6",
-    "peer-id": "^0.9.0",
+    "peer-id": "^0.10.0",
     "pull-stream": "^3.6.0"
   },
   "devDependencies": {
-    "aegir": "^12.0.0",
+    "aegir": "^12.0.2",
     "dirty-chai": "^2.0.1"
   },
   "contributors": [
diff --git a/src/swarm.js b/src/swarm.js
index 2774e60767..5a48d1b006 100644
--- a/src/swarm.js
+++ b/src/swarm.js
@@ -11,17 +11,14 @@ const series = require('async/series')
 const multiaddr = require('multiaddr')
 
 module.exports = (common) => {
-  describe('.swarm', () => {
+  describe('.swarm', function () {
+    this.timeout(80 * 1000)
+
     let ipfsA
     let ipfsB
     let factoryInstance
 
-    before(function (done) {
-      // CI takes longer to instantiate the daemon,
-      // so we need to increase the timeout for the
-      // before step
-      this.timeout(50 * 1000)
-
+    before((done) => {
       common.setup((err, factory) => {
         expect(err).to.not.exist()
         factoryInstance = factory
@@ -50,7 +47,9 @@ module.exports = (common) => {
 
     let ipfsBId
 
-    describe('callback API', () => {
+    describe('callback API', function () {
+      this.timeout(80 * 1000)
+
       it('.connect', (done) => {
         ipfsB.id((err, id) => {
           expect(err).to.not.exist()
@@ -263,7 +262,9 @@ module.exports = (common) => {
       })
     })
 
-    describe('promise API', () => {
+    describe('promise API', function () {
+      this.timeout(80 * 1000)
+
       it('.connect', () => {
         return ipfsB.id()
           .then((id) => {