diff --git a/src/core/components/stop.js b/src/core/components/stop.js
index 19c8c50939..6cae007bf1 100644
--- a/src/core/components/stop.js
+++ b/src/core/components/stop.js
@@ -9,7 +9,7 @@ module.exports = (self) => {
     self.log('stop')
 
     if (self.state.state() !== 'running') {
-      return done(new Error('Not able to stop from state: ' + self.state.state()))
+      return callback(new Error('Not able to stop from state: ' + self.state.state()))
     }
 
     const done = (err) => {
diff --git a/test/core/interface/generic.js b/test/core/interface/generic.js
index 9af526e58b..cdf0d3b8e8 100644
--- a/test/core/interface/generic.js
+++ b/test/core/interface/generic.js
@@ -26,7 +26,9 @@ const common = {
     })
   },
   teardown: function (callback) {
-    parallel(nodes.map((node) => (cb) => node.stop(cb)), callback)
+    // No need to stop, because the test suite does a 'stop' test.
+    // parallel(nodes.map((node) => (cb) => node.stop(cb)), callback)
+    callback(null)
   }
 }