diff --git a/build_num b/build_num
index c41dfc228..fc23a7b8f 100644
--- a/build_num
+++ b/build_num
@@ -1 +1 @@
-#define BUILD_NUM 2316
+#define BUILD_NUM 2317
diff --git a/fwbuilder3.pro b/fwbuilder3.pro
index 40adbdb0d..8055d81c9 100644
--- a/fwbuilder3.pro
+++ b/fwbuilder3.pro
@@ -14,7 +14,7 @@ tests.commands = for directory in `find . -name unit_tests`; \
                     echo "Running test in "$${DOLLAR}$${DOLLAR}directory; \
                     cd $${DOLLAR}$${DOLLAR}directory; \
                     qmake -spec $${DOLLAR}$${DOLLAR}QMAKESPEC; \
-                    make run; \
+                    make run || exit 1; \
                     cd $${DOLLAR}$${DOLLAR}home; \
                 done
 
diff --git a/src/compiler_lib/unit_tests/tests_main.pro b/src/compiler_lib/unit_tests/tests_main.pro
index ae833275a..3ef86e9a5 100644
--- a/src/compiler_lib/unit_tests/tests_main.pro
+++ b/src/compiler_lib/unit_tests/tests_main.pro
@@ -52,8 +52,11 @@ win32:CONFIG += console
 win32:LIBS += ../../common/release/common.lib
 win32:PRE_TARGETDEPS = ../../common/release/common.lib
 
-run.commands = echo "Running tests..." && ./${TARGET} && \
-               echo "Running gcov..." && gcov ${SOURCES} >/dev/null 2>/dev/null && echo "OK" || echo "FAILED"
+run.commands = echo "Running tests..." && \
+    ./${TARGET} && \
+    echo "Running gcov..." && \
+    gcov ${SOURCES} >/dev/null 2>/dev/null && \
+    echo "OK" || { echo "FAILED"; exit 1 }
 run.depends = all
 
 QMAKE_EXTRA_TARGETS += run
diff --git a/src/gui/unit_tests/FWBTree/FWBTree.pro b/src/gui/unit_tests/FWBTree/FWBTree.pro
index e02f15af7..89c8606e9 100644
--- a/src/gui/unit_tests/FWBTree/FWBTree.pro
+++ b/src/gui/unit_tests/FWBTree/FWBTree.pro
@@ -28,7 +28,13 @@ QMAKE_CLEAN = *.gc??
 LIBS += $$LIBS_FWCOMPILER $$LIBS_FWBUILDER $$CPPUNIT_LIBS
 LIBS += -lgcov # -lcppunit
 
-run.commands = ./${TARGET} && gcov -o . ../../FWBTree.cpp >/dev/null 2>/dev/null
+#run.commands = ./${TARGET} && gcov -o . ../../FWBTree.cpp >/dev/null 2>/dev/null
+
+run.commands = echo "Running tests..." && \
+    ./${TARGET} && echo "Running gcov..." && \
+    gcov ${SOURCES} >/dev/null 2>/dev/null && \
+    echo "OK" || { echo "FAILED"; exit 1 }
+
 run.depends = all
 
 QMAKE_EXTRA_TARGETS += run
diff --git a/src/gui/unit_tests/ImporterTest/ImporterTest.pro b/src/gui/unit_tests/ImporterTest/ImporterTest.pro
index 2996c60fa..24be9da52 100644
--- a/src/gui/unit_tests/ImporterTest/ImporterTest.pro
+++ b/src/gui/unit_tests/ImporterTest/ImporterTest.pro
@@ -58,9 +58,10 @@ LIBS		 += ../../../parsers/libfwbparser.a  $$ANTLR_LIBS
 DEFINES		 += $$ANTLR_DEFINES
 
 
-run.commands = echo "Running tests..." \
-    && ./${TARGET} && echo "Running gcov..." && \
+run.commands = echo "Running tests..." && \
+    ./${TARGET} && echo "Running gcov..." && \
     gcov ${SOURCES} >/dev/null 2>/dev/null && \
-    echo "OK" || echo "FAILED"
+    echo "OK" || { echo "FAILED"; exit 1 }
+
 run.depends = all
 QMAKE_EXTRA_TARGETS += run
diff --git a/src/gui/unit_tests/unit_tests.pro b/src/gui/unit_tests/unit_tests.pro
index 12e6bee4b..b32214bc3 100644
--- a/src/gui/unit_tests/unit_tests.pro
+++ b/src/gui/unit_tests/unit_tests.pro
@@ -6,7 +6,7 @@ run.commands = echo "Running tests..." && \
                     home=`pwd`; \
                     cd $${DOLLAR}$${DOLLAR}directory; \
                     qmake -spec $${DOLLAR}$${DOLLAR}QMAKESPEC; \
-                    make run; \
+                    make run || exit 1; \
                     cd $${DOLLAR}$${DOLLAR}home; \
                 done