diff --git a/apparmor/tumbler/test-tumbler b/apparmor/tumbler/test-tumbler
index 509eacf2fb868be4b74b43606159ab3b22d3a1a9..84df897840e43fc54d253920c9100cff946c43c4 100755
--- a/apparmor/tumbler/test-tumbler
+++ b/apparmor/tumbler/test-tumbler
@@ -1,7 +1,7 @@
 #!/bin/bash
 # vim: tw=0
 
-TEST_DIR="${TEST_DIR:-/usr/lib/apertis-tests/apparmor/tumbler}"
+TEST_DIR=$(cd $(dirname $0); pwd; cd - &>/dev/null)
 # We want to use the pre-existing session bus.
 export LAUNCH_DBUS="no"
 
diff --git a/apparmor/tumbler/tumbler b/apparmor/tumbler/tumbler
index 672ab36c0df32e781c4d3fef994fcc722d7c4459..bd68b1f2f2789e2a63e531c97ef2525ae627a7a9 100755
--- a/apparmor/tumbler/tumbler
+++ b/apparmor/tumbler/tumbler
@@ -10,10 +10,12 @@ fi
 
 export APERTIS_TESTS_NAME_PREFIX="${1}_"
 
+TEST_DIR=$(cd $(dirname $0); pwd; cd - &>/dev/null)
+
 if [[ $1 == "malicious" ]]; then
     LD_PRELOAD="/usr/lib/apertis-tests/apparmor/tumbler/libtumbler-malicious-override.so" \
-    /usr/share/chaiwala-tests/tumbler/automated/run-test.sh
+    $TEST_DIR/../../tumbler/automated/run-test.sh
 else
-    /usr/share/chaiwala-tests/tumbler/automated/run-test.sh
+    $TEST_DIR/../../tumbler/automated/run-test.sh
 fi