diff --git a/build_num b/build_num
index 2e199d17a..d2c53fe1a 100644
--- a/build_num
+++ b/build_num
@@ -1 +1 @@
-#define BUILD_NUM 2811
+#define BUILD_NUM 2822
diff --git a/src/gui/unit_tests/unit_tests.sh b/src/gui/unit_tests/unit_tests.sh
index 0a30e0b0e..d0b93ef0b 100755
--- a/src/gui/unit_tests/unit_tests.sh
+++ b/src/gui/unit_tests/unit_tests.sh
@@ -2,22 +2,11 @@
 
 commands=$@
 
-
 for directory in `find . -maxdepth 1 -type d -regex '\./[A-Za-z0-9\-\_]*'`
 do
     cd $directory
     [ ! -e Makefile ] && qmake -spec $QMAKESPEC
-
-    PID=""
-    [ -z "$DISPLAY" ] && {
-        Xvfb :1 &
-        PID=$!
-        export DISPLAY=":1"
-    }
-    $commands; TEST_STATUS=$?
-    [ -n "$PID" ] && kill $PID
-    [ $TEST_STATUS ] || exit 0
-
+    $commands || exit 1
     cd -
 done
 
diff --git a/src/iptlib/unit_tests/unit_tests.sh b/src/iptlib/unit_tests/unit_tests.sh
index 5aa14eb16..4cd18fbb6 100755
--- a/src/iptlib/unit_tests/unit_tests.sh
+++ b/src/iptlib/unit_tests/unit_tests.sh
@@ -2,16 +2,11 @@
 
 commands=$@
 
-Xvfb :1 &
-PID=$!
-export DISPLAY=":1"
-
 for directory in `find . -maxdepth 1 -type d -regex '\./[A-Za-z0-9\-\_]*'`
 do
     cd $directory
     [ ! -e Makefile ] && qmake -spec $QMAKESPEC
-    $commands || { kill $PID; exit 1; }
+    $commands || exit 1;
     cd -
 done
 
-kill $PID || exit 0