diff --git a/test/testutils.js b/test/testutils.js
index b81df486..39495f21 100644
--- a/test/testutils.js
+++ b/test/testutils.js
@@ -129,14 +129,14 @@ var build_teardown = function (host) {
           .connect(false);
       },
       function stopServerStep(callback) {
-
         if (opts.no_server)
         {
+          return callback();
+        }
 
-                return callback();
-                }
-
-        data.server.on('stopped', callback).stop();
+        data.server
+          .on('stopped', callback)
+          .stop();
       }
     ], done);
   };