diff --git a/.gitignore b/.gitignore
index 63ff99a..f1881e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,7 @@
 build/
 docs/
 
-tests/testing_latest/
-tests/testing_bak/
+tests/testing/
 
 include/sql/*.h
 
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index ac523f0..1b158b6 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -1,15 +1,10 @@
 #!/usr/bin/env sh
 
 source_dir=$PWD
-working_dir=$PWD/testing_latest
-working_bak=$PWD/testing_bak
+working_dir=$PWD/testing
 
 alias valgrind_emgauwa="valgrind -s $2 --log-file=$working_dir/valgrind.log"
 
-
-rm -rf $working_bak
-[ -d $working_dir ] && mv $working_dir $working_bak
-
 mkdir -p $working_dir
 cd $working_dir
 
@@ -17,15 +12,17 @@ target_branch=$(git rev-parse --abbrev-ref HEAD)
 
 if [ -z "$EMGAUWA_CONTROLLER_EXE" ]
 then
-    git clone --quiet ssh://git@git.serguzim.me:3022/emgauwa/controller.git controller || exit
-    cd ./controller
+    mkdir -p controller
+    cd controller
+
+    git pull >/dev/null || git clone --quiet ssh://git@git.serguzim.me:3022/emgauwa/controller.git . || exit
 
     git checkout dev >/dev/null 2>&1
     git checkout $target_branch >/dev/null 2>&1
     git checkout $2 >/dev/null 2>&1
 
     echo "Building controller on branch $(git rev-parse --abbrev-ref HEAD)"
-    mkdir build
+    mkdir -p build
     cd build
 
     cmake -DWIRING_PI_DEBUG=on .. >/dev/null
@@ -69,4 +66,10 @@ test_result=$?
 kill $core_id
 kill $controller_id
 
+timestamp=$(date -Iseconds)
+for backup_file in core.log controller.log valgrind.log core.sqlite; do
+    mv $backup_file $timestamp.$backup_file
+    ln -sf $timestamp.$backup_file latest.$backup_file
+done
+
 exit $test_result