diff --git a/test/run-unittest.sh b/test/run-unittest.sh
index ccd0831..c28940a 100755
--- a/test/run-unittest.sh
+++ b/test/run-unittest.sh
@@ -1,17 +1,21 @@
 #!/bin/bash
 
-function die() {
-    echo -e 1>&2 "\033[0;31m"$@"\033[0m"
-    exit 1
-}
-
-export -f die
-
 function log() {
     echo -e "\033[0;33m[INFO] "$@"\033[0m"
 }
 
+function logError() {
+    echo -e 1>&2 "\033[0;31m"$@"\033[0m"
+    any_errors=1
+}
+
+function die() {
+    logError "$@"
+    exit 1
+}
+
 export -f log
+export -f die
 
 if [ -z ${DUB} ]; then
     die 'Error: Variable $DUB must be defined to run the tests.'
@@ -27,7 +31,7 @@
 for script in $(ls $CURR_DIR/*.sh); do
     if [ "$script" = "$(readlink -f ${BASH_SOURCE[0]})" ]; then continue; fi
     log "Running $script..."
-    DUB=$DUB COMPILER=$COMPILER CURR_DIR="$CURR_DIR" $script || die "Script failure."
+    DUB=$DUB COMPILER=$COMPILER CURR_DIR="$CURR_DIR" $script || logError "Script failure."
 done
 
 for pack in $(ls -d $CURR_DIR/*/); do
@@ -35,23 +39,24 @@
     if [ ! -e $pack/.no_build ]; then # For sourceLibrary
         if [ -e $pack/.fail_build ]; then
             log "Building $pack, expected failure..."
-            $DUB build --force --root=$pack --compiler=$COMPILER 2>/dev/null && die "Error: Failure expected, but build passed."
+            $DUB build --force --root=$pack --compiler=$COMPILER 2>/dev/null && logError "Error: Failure expected, but build passed."
         else
             log "Building $pack..."
-            $DUB build --force --root=$pack --compiler=$COMPILER || die "Build failure."
+            $DUB build --force --root=$pack --compiler=$COMPILER || logError "Build failure."
         fi
     fi
 
     # We run the ones that are supposed to be runned
     if [ ! -e $pack/.no_build ] && [ ! -e $pack/.no_run ]; then
         log "Running $pack..."
-        $DUB run --force --root=$pack --compiler=$COMPILER || die "Run failure."
+        $DUB run --force --root=$pack --compiler=$COMPILER || logError "Run failure."
     fi
 
     # Finally, the unittest part
     if [ ! -e $pack/.no_build ] && [ ! -e $pack/.no_test ]; then
         log "Testing $pack..."
-        $DUB test --force --root=$pack --compiler=$COMPILER || die "Test failure."
+        $DUB test --force --root=$pack --compiler=$COMPILER || logError "Test failure."
     fi
-
 done
+
+exit $any_errors