diff --git a/scripts/run-regression-test.sh b/scripts/run-regression-test.sh
index 556c65b8..1a6378e6 100755
--- a/scripts/run-regression-test.sh
+++ b/scripts/run-regression-test.sh
@@ -1,19 +1,20 @@
 #!/bin/bash
 declare testsuccess=$true;
+declare fail_dir=$PWD/../
 declare build_dir=$PWD/../build
 declare target_dir=$PWD/../../experiment_targets/regression-test
 declare script_dir=$PWD
 
-cd $build_dir;
+#Exists build-directory?
+cd $fail_dir;
 if [ ! -d build ]; then
 mkdir build;
 cd build;
 cmake ..;
 fi
-cp ../../experiment_targets/regression-test/CMakeCache.txt CMakeCache.txt -f
-cd $target_dir;
 cd $build_dir;
-#$script_dir/rebuild-bochs.sh;
+cp $target_dir/CMakeCache.txt CMakeCache.txt -f
+$script_dir/rebuild-bochs.sh;
 cd $target_dir;
 $build_dir/bin/fail-client -q;
 
@@ -29,12 +30,12 @@ fi
 diff -q regression-test.results golden_run/regression-test.results
 if [ ! $? -eq 0 ]
 then
-    echo -e  '\033[37;44m Regression-Test FAILED. \033[0m'
+    echo -e  '\033[37;44m Regression-Test FAILED. Look at regression-test.results for more information. \033[0m'
     if $testsuccess;
     then
         echo -e  '\033[37;44m Tracing-Plugin Test SUCCESS. \033[0m'
     else
-        echo -e  '\033[37;44m Tracing-Plugin Test FAILED. \033[0m'
+        echo -e  '\033[37;44m Tracing-Plugin Test FAILED. Look at regression-trace.results for more information. \033[0m'
     fi
 else
     if $testsuccess;
@@ -42,7 +43,7 @@ else
         echo -e  '\033[37;44m Regression-Test SUCCESS. \033[0m'
         echo -e  '\033[37;44m Tracing-Plugin Test SUCCESS. \033[0m'
     else
-        echo -e  '\033[37;44m Regression-Test FAILED. \033[0m'
+        echo -e  '\033[37;44m Regression-Test FAILED.  Look at regression-test.results for more information. \033[0m'
         echo -e  '\033[37;44m Tracing-Plugin Test FAILED. \033[0m'
     fi
 fi