diff --git a/src/App/FreeCADTest.py b/src/App/FreeCADTest.py
index 31759e10e..ac396a58f 100644
--- a/src/App/FreeCADTest.py
+++ b/src/App/FreeCADTest.py
@@ -32,9 +32,10 @@
 
 Log ("FreeCAD test running...\n\n")
 
-import TestApp;TestApp.TestText("TestApp.All")
+import TestApp, os
 
+testResult = TestApp.TestText("TestApp.All")
 
 Log ("FreeCAD test done\n")
 
-
+os._exit(0 if testResult.wasSuccessful() else 1)
diff --git a/src/Mod/Test/TestApp.py b/src/Mod/Test/TestApp.py
index accb90d84..ca23c56a8 100644
--- a/src/Mod/Test/TestApp.py
+++ b/src/Mod/Test/TestApp.py
@@ -63,7 +63,7 @@ def All():
 def TestText(s):
     s = unittest.defaultTestLoader.loadTestsFromName(s)
     r = unittest.TextTestRunner(stream=sys.stdout, verbosity=2)
-    r.run(s)
+    return r.run(s)
 
 
 def Test(s):
@@ -72,7 +72,7 @@ def Test(s):
 
 def testAll():
     r = unittest.TextTestRunner(stream=sys.stdout, verbosity=2)
-    r.run(All())
+    return r.run(All())
 
 
 def testUnit():