diff --git a/package.json b/package.json
index 80af528..2e99bc7 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "async": "^2.1.4",
     "chai": "^3.5.0",
     "gulp": "^3.9.1",
-    "libp2p-ipfs-nodejs": "^0.17.1",
+    "libp2p-ipfs-nodejs": "^0.17.2",
     "peer-id": "^0.8.1",
     "pre-commit": "^1.2.2",
     "pull-goodbye": "0.0.1",
@@ -53,7 +53,7 @@
     "multiaddr": "^2.1.1",
     "peer-book": "^0.3.0",
     "peer-id": "^0.8.1",
-    "peer-info": "^0.8.1"
+    "peer-info": "^0.8.2"
   },
   "contributors": [
     "David Dias <daviddias.p@gmail.com>",
diff --git a/test/webrtc-star-only.js b/test/webrtc-star-only.js
index c5c2012..7adfd44 100644
--- a/test/webrtc-star-only.js
+++ b/test/webrtc-star-only.js
@@ -10,9 +10,7 @@ const pull = require('pull-stream')
 
 const Node = require('../src')
 
-describe('libp2p-ipfs-browser (webrtc only)', function () {
-  this.timeout(15 * 1000)
-
+describe('libp2p-ipfs-browser (webrtc only)', () => {
   let peer1
   let peer2
   let node1
@@ -104,6 +102,16 @@ describe('libp2p-ipfs-browser (webrtc only)', function () {
   })
 
   it('create a third node and check that discovery works', (done) => {
+    let counter = 0
+
+    function check () {
+      if (++counter === 3) {
+        expect(Object.keys(node1.swarm.muxedConns).length).to.equal(1)
+        expect(Object.keys(node2.swarm.muxedConns).length).to.equal(1)
+        done()
+      }
+    }
+
     PeerId.create((err, id3) => {
       expect(err).to.not.exist
 
@@ -111,21 +119,11 @@ describe('libp2p-ipfs-browser (webrtc only)', function () {
       const mh3 = multiaddr('/libp2p-webrtc-star/ip4/127.0.0.1/tcp/15555/ws/ipfs/' + id3.toB58String())
       peer3.multiaddr.add(mh3)
 
-      node1.discovery.on('peer', (peerInfo) => {
-        node1.dialByPeerInfo(peerInfo, () => {})
-      })
-      node2.discovery.on('peer', (peerInfo) => {
-        node2.dialByPeerInfo(peerInfo, () => {})
-      })
+      node1.discovery.on('peer', (peerInfo) => node1.dialByPeerInfo(peerInfo, check))
+      node2.discovery.on('peer', (peerInfo) => node2.dialByPeerInfo(peerInfo, check))
 
       const node3 = new Node(peer3)
-      node3.start(() => {
-        setTimeout(() => {
-          expect(Object.keys(node1.swarm.muxedConns).length).to.equal(1)
-          expect(Object.keys(node2.swarm.muxedConns).length).to.equal(1)
-          done()
-        }, 2000)
-      })
+      node3.start(check)
     })
   })
 })