diff --git a/test/connector/passive.spec.js b/test/connector/passive.spec.js
index e4effa8..a17a942 100644
--- a/test/connector/passive.spec.js
+++ b/test/connector/passive.spec.js
@@ -87,19 +87,23 @@ describe('Connector - Passive //', function () {
     return passive.setupServer()
     .then(() => {
       expect(passive.dataServer).to.exist;
+      return passive.end();
     });
   });
 
   describe('setup', function () {
     let passive;
     let closeFnSpy;
-    before(function () {
+    beforeEach(function () {
       passive = new PassiveConnector(mockConnection);
       return passive.setupServer()
       .then(() => {
         closeFnSpy = sandbox.spy(passive.dataServer, 'close');
       });
     });
+    afterEach(function () {
+      return passive.end();
+    });
 
     it('destroys existing server, then sets up a server', function () {
       return passive.setupServer()
@@ -124,7 +128,9 @@ describe('Connector - Passive //', function () {
         setTimeout(() => {
           expect(passive.connection.reply.callCount).to.equal(1);
           expect(passive.connection.reply.args[0][0]).to.equal(550);
-          done();
+
+          passive.end()
+          .then(() => done());
         }, 100);
       });
     })