diff --git a/test/nodes/helper.js b/test/nodes/helper.js
index 418a02e4d..b1765af0a 100644
--- a/test/nodes/helper.js
+++ b/test/nodes/helper.js
@@ -149,6 +149,9 @@ module.exports = {
     stopServer: function(done) {
         if (server) {
             try {
+                server.on('close', function() {
+                    comms.stop();
+                });
                 server.close(done);
             } catch(e) {
                 done();