diff --git a/TestSuite/2067.pas b/TestSuite/2067.pas
index 3402ada63..57bf4de5f 100644
--- a/TestSuite/2067.pas
+++ b/TestSuite/2067.pas
@@ -17,5 +17,5 @@ begin
 end;
 
 begin 
-  Assert(1=1);
+  Assert(1=0);
 end
\ No newline at end of file
diff --git a/bin/TestRunner.exe b/bin/TestRunner.exe
index 46ceb9b19..c6d48b895 100644
Binary files a/bin/TestRunner.exe and b/bin/TestRunner.exe differ
diff --git a/bin/TestRunner.pas b/bin/TestRunner.pas
index bdfb25986..6b90a6113 100644
--- a/bin/TestRunner.pas
+++ b/bin/TestRunner.pas
@@ -245,7 +245,16 @@ begin
       p.StandardInput.WriteLine('GO');
 		  //p.StandardInput.AutoFlush := true;
 		  //var p := System.Diagnostics.Process.Start(psi);
-    p.WaitForExit();
+		if nogui then
+    begin
+      var success := p.WaitForExit(60000);
+      if not success then
+      begin
+        raise new Exception('Running of ' + files[i] + ' failed.');
+      end;
+    end
+    else
+      p.WaitForExit();
     //while not p.HasExited do
     //  Sleep(5);
     if p.ExitCode <> 0 then