diff --git a/package.json b/package.json
index 4d47a23..53c4ed9 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "simple-websocket-server": "^0.1.4"
   },
   "devDependencies": {
-    "aegir": "^4.0.0",
+    "aegir": "^6.0.0",
     "multiaddr": "^2.0.2",
     "chai": "^3.5.0",
     "gulp": "^3.9.1",
diff --git a/test/node.js b/test/node.js
index 6b7fd88..655721f 100644
--- a/test/node.js
+++ b/test/node.js
@@ -210,18 +210,22 @@ describe('valid Connection', () => {
     listener.listen(ma, () => {
       const conn = ws.dial(ma)
 
-      conn.on('end', () => {
+      conn.on('end', onEnd)
+
+      function onEnd () {
         conn.getObservedAddrs((err, addrs) => {
           expect(err).to.not.exist
           listenerObsAddrs = addrs
 
-          listener.close(() => {
+          listener.close(onClose)
+
+          function onClose () {
             expect(listenerObsAddrs[0]).to.deep.equal(ma)
             expect(dialerObsAddrs.length).to.equal(0)
             done()
-          })
+          }
         })
-      })
+      }
       conn.resume()
       conn.end()
     })
@@ -243,12 +247,14 @@ describe('valid Connection', () => {
     listener.listen(ma, () => {
       const conn = ws.dial(ma)
 
-      conn.on('end', () => {
+      conn.on('end', onEnd)
+
+      function onEnd () {
         conn.getPeerInfo((err, peerInfo) => {
           expect(err).to.exit
           listener.close(done)
         })
-      })
+      }
       conn.resume()
       conn.end()
     })
@@ -269,7 +275,8 @@ describe('valid Connection', () => {
       conn.pipe(conn)
     })
 
-    listener.listen(ma, () => {
+    listener.listen(ma, onListen)
+    function onListen () {
       const conn = ws.dial(ma)
       conn.setPeerInfo('b')
 
@@ -282,7 +289,7 @@ describe('valid Connection', () => {
       })
       conn.resume()
       conn.end()
-    })
+    }
   })
 })