diff --git a/test/run-tests.sh b/test/run-tests.sh
index 410f566..24ef18d 100755
--- a/test/run-tests.sh
+++ b/test/run-tests.sh
@@ -157,4 +157,6 @@ if [[ $1 && $1 != build ]]; then
     : ${scenario:=default}
 fi
 
-eval "${@:-build}"
+command="${1:-build}"
+shift || true
+$command "$@"