diff --git a/fwbuilder3.pro b/fwbuilder3.pro
index 7bbbb4fae..3832a1f51 100644
--- a/fwbuilder3.pro
+++ b/fwbuilder3.pro
@@ -7,15 +7,24 @@ SUBDIRS = src doc
 
 DOLLAR = $
 
-build_tests.commands = cd src/unit_tests; make build_tests; cd -
+build_tests.commands = cd src/unit_tests; \
+                       qmake -spec $${DOLLAR}$${DOLLAR}QMAKESPEC && \
+                       ./unit_tests.sh make build_tests; \
+                       cd -
 build_tests.depends = all
 
-run_tests.commands = cd src/unit_tests; make run_tests; cd -
+run_tests.commands = cd src/unit_tests; \
+                     qmake -spec $${DOLLAR}$${DOLLAR}QMAKESPEC && \
+                     ./unit_tests.sh make run_tests; \
+                     cd -
 run_tests.depends = all
 
 tests.depends = run_tests
 
-clean_tests.commands = cd src/unit_tests; make clean_tests; cd -
+clean_tests.commands = cd src/unit_tests; \
+                       qmake -spec $${DOLLAR}$${DOLLAR}QMAKESPEC && \
+                       ./unit_tests.sh make clean_tests; \
+                       cd -
 
 QMAKE_EXTRA_TARGETS += build_tests run_tests clean_tests tests 
 
diff --git a/src/unit_tests/tests_common.pri b/src/unit_tests/tests_common.pri
index 9afc6e2a8..73287afac 100644
--- a/src/unit_tests/tests_common.pri
+++ b/src/unit_tests/tests_common.pri
@@ -35,7 +35,7 @@ run_tests.commands = echo "Running tests..."; \
     ./${TARGET}
 run_tests.depends = build_tests
 build_tests.depends = all
-clean_tests.depends = all
+clean_tests.depends = clean 
 QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
 
 INCLUDEPATH += $$ANTLR_INCLUDEPATH
diff --git a/src/unit_tests/unit_tests.sh b/src/unit_tests/unit_tests.sh
index 7072fbbf4..83462c118 100755
--- a/src/unit_tests/unit_tests.sh
+++ b/src/unit_tests/unit_tests.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set +x
+
 commands=$@
 
 for directory in `find . -maxdepth 1 -name '*[tT]est' -type d -regex '\./[A-Za-z0-9\-\_]*'`