diff --git a/Tests/CodexContinuousTests/ContinuousTestRunner.cs b/Tests/CodexContinuousTests/ContinuousTestRunner.cs
index d3982a85..1132106a 100644
--- a/Tests/CodexContinuousTests/ContinuousTestRunner.cs
+++ b/Tests/CodexContinuousTests/ContinuousTestRunner.cs
@@ -73,6 +73,7 @@ namespace ContinuousTests
             {
                 var targetDuration = TimeSpan.FromSeconds(config.TargetDurationSeconds);
                 cancelToken.WaitHandle.WaitOne(targetDuration);
+                Cancellation.Cts.Cancel();
                 overviewLog.Log($"Congratulations! The targer duration has been reached! ({Time.FormatDuration(targetDuration)})");
                 statusLog.ConcludeTest("Passed", testDuration, testData);
             }
diff --git a/Tests/CodexContinuousTests/SingleTestRun.cs b/Tests/CodexContinuousTests/SingleTestRun.cs
index a046bfc1..8cb384f7 100644
--- a/Tests/CodexContinuousTests/SingleTestRun.cs
+++ b/Tests/CodexContinuousTests/SingleTestRun.cs
@@ -73,12 +73,10 @@ namespace ContinuousTests
             try
             {
                 foreach (var m in monitors) m.Run();
+                fixtureLog.Log("Monitor start");
 
                 RunTestMoments();
 
-                foreach (var m in monitors) m.Stop();
-                if (monitors.Any(m => m.Fault)) throw new Exception("Any faulted");
-
                 if (!config.KeepPassedTestLogs)
                 {
                     fixtureLog.Delete();
@@ -103,6 +101,13 @@ namespace ContinuousTests
                     }
                 }
             }
+            finally
+            {
+                Thread.Sleep(1000);
+                fixtureLog.Log("Monitor stop");
+                foreach (var m in monitors) m.Stop();
+                if (monitors.Any(m => m.Fault)) throw new Exception("One or more downloaded container log is missing lines!");
+            }
         }
 
         private void ApplyLogReplacements(FixtureLog fixtureLog, StartupChecker startupChecker)
@@ -143,6 +148,7 @@ namespace ContinuousTests
                     return;
                 }
             }
+            fixtureLog.Log("Test run has been cancelled.");
         }
 
         private void ThrowFailTest()
diff --git a/Tests/CodexContinuousTests/TestLoop.cs b/Tests/CodexContinuousTests/TestLoop.cs
index 002e4ad9..c1002b80 100644
--- a/Tests/CodexContinuousTests/TestLoop.cs
+++ b/Tests/CodexContinuousTests/TestLoop.cs
@@ -39,7 +39,7 @@ namespace ContinuousTests
                 {
                     NumberOfPasses = 0;
                     NumberOfFailures = 0;
-                    while (true)
+                    while (!cancelToken.IsCancellationRequested)
                     {
                         WaitHandle.WaitAny(new[] { runFinishedHandle, cancelToken.WaitHandle });