diff --git a/wally/main.py b/wally/main.py
index 36d40f0..56d72db 100644
--- a/wally/main.py
+++ b/wally/main.py
@@ -49,7 +49,7 @@
                        LoadStoredNodesStage)
 
 from .report import HtmlReportStage
-from .sensors import StartSensorsStage, CollectSensorsStage
+from .sensors import StartSensorsStage, CollectSensorsStage, StopSensorsStage
 from .console_report import ConsoleReportStage
 
 
@@ -253,7 +253,7 @@
             ExplicitNodesStage(),
             StartSensorsStage(),
             RunTestsStage(),
-            CollectSensorsStage(),
+            StopSensorsStage(),
             ConnectStage(),
             SleepStage(),
             PrepareNodes()]
@@ -299,6 +299,9 @@
         if not opts.dont_collect:
             stages.append(CollectInfoStage())
 
+        if config.no_tests:
+            stages.append(CollectSensorsStage())
+
         argv2 = argv[:]
         if '--ssh-key-passwd' in argv2:
             # don't save ssh key password to storage