diff --git a/test/runtest.sh b/test/runtest.sh
index 75094567..46aca966 100755
--- a/test/runtest.sh
+++ b/test/runtest.sh
@@ -41,7 +41,9 @@ teardown() {
     wait
 }
 
-TEST_DIR=$(dirname "$1")
+TEST="$1"
+TEST_DIR=$(dirname "$TEST")
+shift
 
 trap teardown EXIT
 
diff --git a/test/testenv_exec.sh b/test/testenv_exec.sh
index f2929d48..675748ea 100755
--- a/test/testenv_exec.sh
+++ b/test/testenv_exec.sh
@@ -14,6 +14,7 @@ TEST_DIR=$(dirname "$0")
 TESTS_ROOT="$(pwd)/${TEST_DIR}/test_root"
 
 nsenter=$(which nsenter)
+chroot=$(which chroot)
 
 export PATH=/sbin:/bin
 "$nsenter" \
@@ -25,4 +26,4 @@ export PATH=/sbin:/bin
     --net \
     --pid \
     -w -t "$target" \
-    chroot "$TESTS_ROOT" "$@"
+    "$chroot" "$TESTS_ROOT" "$@"
diff --git a/test/testenv_start.sh b/test/testenv_start.sh
index 3281d5b7..07a69d73 100755
--- a/test/testenv_start.sh
+++ b/test/testenv_start.sh
@@ -8,6 +8,7 @@ TESTS_ROOT="$(pwd)/${TEST_DIR}/test_root"
 >&2 echo "Hint: Execute '${TEST_DIR}/testenv_exec.sh \$(pgrep -P $$) /bin/sh; reset' to enter the test namespace"
 
 unshare=$(which unshare)
+chroot=$(which chroot)
 
 # Not supported by Busybox unshare:
 #  --cgroup --time
@@ -18,4 +19,4 @@ exec "$unshare" \
     --mount \
     --mount-proc \
     --uts --ipc --net \
-    chroot "$TESTS_ROOT" /bin/chrootsetup.sh "$@"
+    "$chroot" "$TESTS_ROOT" /bin/chrootsetup.sh "$@"