diff --git a/components/fpcunit/console/consoletestrunner.pas b/components/fpcunit/console/consoletestrunner.pas
index b2797b32fe..b187f0aa88 100644
--- a/components/fpcunit/console/consoletestrunner.pas
+++ b/components/fpcunit/console/consoletestrunner.pas
@@ -160,7 +160,6 @@ var
         WriteXMLFile(XMLResultsWriter.Document, output);
     finally
       XMLResultsWriter.Free;
-      testResult.Free;
     end;
   end;
 
@@ -177,7 +176,6 @@ var
       PlainResultsWriter.WriteResult(testResult);
     finally
       PlainResultsWriter.Free;
-      testResult.Free;
     end;
   end;
   {$ENDIF}
@@ -197,9 +195,12 @@ begin
       else
         doXMLTestRun(aTest);
     end;
+    if testResult.NumberOfErrors+testResult.NumberOfFailures>0 then
+      ExitCode := 1;
   finally
     if ShowProgress then
       progressWriter.Free;
+    testResult.Free;
   end;
 end;
 
diff --git a/test/bugtestcase.pas b/test/bugtestcase.pas
index 5376f89ba5..1f64854fd1 100644
--- a/test/bugtestcase.pas
+++ b/test/bugtestcase.pas
@@ -23,7 +23,7 @@ unit BugTestCase;
 interface
 
 uses
-  Classes, SysUtils, Math, process, fileutil, fpcunit, testutils, testregistry,
+  Classes, SysUtils, Math, process, fileutil, fpcunit, testregistry,
   TestGlobals;
 
 type