diff --git a/recipes/groups/auto-test/auto-test.ion b/recipes/groups/auto-test/auto-test.ion
index 58fb4e09b..42a188d2e 100644
--- a/recipes/groups/auto-test/auto-test.ion
+++ b/recipes/groups/auto-test/auto-test.ion
@@ -1,6 +1,5 @@
 #!/usr/bin/env ion
 export RUST_BACKTRACE=full
-cd /home/user/acid
-cargo test
-bash /root/relibc-tests/run.sh
-os-test-runner
\ No newline at end of file
+acid-runner
+relibc-tests-runner
+os-test-runner
diff --git a/recipes/tests/acid/recipe.toml b/recipes/tests/acid/recipe.toml
index 831335255..54106685e 100644
--- a/recipes/tests/acid/recipe.toml
+++ b/recipes/tests/acid/recipe.toml
@@ -8,6 +8,18 @@ template = "custom"
 script = """
 mkdir -pv "${COOKBOOK_STAGE}/home/user/acid"
 cp -rv "${COOKBOOK_SOURCE}"/* "${COOKBOOK_STAGE}/home/user/acid"
+
+# Create runner script
+mkdir -p "${COOKBOOK_STAGE}/usr/bin"
+cat > "${COOKBOOK_STAGE}/usr/bin/acid-runner" <<EOF
+#!/usr/bin/env bash
+set -e
+cd /home/user/acid
+cargo test
+EOF
+
+chmod +x "${COOKBOOK_STAGE}/usr/bin/acid-runner"
+
 """
 [package]
 dependencies = ["rust"]
diff --git a/recipes/tests/os-test-bins/recipe.toml b/recipes/tests/os-test-bins/recipe.toml
index f55c5d1a5..36def03dd 100644
--- a/recipes/tests/os-test-bins/recipe.toml
+++ b/recipes/tests/os-test-bins/recipe.toml
@@ -11,9 +11,9 @@ template = "custom"
 script = """
 DYNAMIC_INIT
 
-# Copy source to /usr/share/os-test
-mkdir -p "${COOKBOOK_STAGE}/usr/share/os-test"
-cd "${COOKBOOK_STAGE}/usr/share/os-test"
+# Copy source to /home/user/os-test
+mkdir -p "${COOKBOOK_STAGE}/home/user/os-test"
+cd "${COOKBOOK_STAGE}/home/user/os-test"
 rsync -a "${COOKBOOK_SOURCE}/" "./"
 
 # Pre-compile tests for Redox
@@ -56,7 +56,7 @@ mkdir -p "${COOKBOOK_STAGE}/usr/bin"
 cat > "${COOKBOOK_STAGE}/usr/bin/os-test-runner" <<EOF
 #!/usr/bin/env bash
 set -e
-cd /usr/share/os-test
+cd /home/user/os-test
 
 echo "Ensuring executables are newer than sources"
 find . -type f -perm /111 -exec touch '{}' ';'
diff --git a/recipes/tests/relibc-tests-bins/recipe.toml b/recipes/tests/relibc-tests-bins/recipe.toml
index 5ca980a82..0849560e9 100644
--- a/recipes/tests/relibc-tests-bins/recipe.toml
+++ b/recipes/tests/relibc-tests-bins/recipe.toml
@@ -11,4 +11,19 @@ make install-tests DESTDIR="${COOKBOOK_STAGE}/home/user" NATIVE_LIBC=1 IS_REDOX=
 if [ -n "$TESTBIN" ]; then
 "${COOKBOOK_REDOXER}" write-exec sh -c "cd /home/user/relibc-tests; make run-once TESTBIN=bins_dynamic/$TESTBIN"
 fi
+
+# Create runner script
+mkdir -p "${COOKBOOK_STAGE}/usr/bin"
+cat > "${COOKBOOK_STAGE}/usr/bin/relibc-tests-runner" <<EOF
+#!/usr/bin/env bash
+set -e
+cd /home/user/relibc-tests
+make run
+EOF
+
+chmod +x "${COOKBOOK_STAGE}/usr/bin/os-test-runner"
+
 """
+
+[package]
+dependencies = ["gnu-make"]