diff --git a/tools/run-nm-test.sh b/tools/run-nm-test.sh
index d08b9fdaaf..9a5015f6a3 100755
--- a/tools/run-nm-test.sh
+++ b/tools/run-nm-test.sh
@@ -148,10 +148,10 @@ else
             ;;
         *)
             if test -z "${TEST+x}"; then
-               TEST="$1";
-               shift
+                TEST="$1";
+            else
+                TEST_ARGV+=("$1")
             fi
-            TEST_ARGV+=("$1")
             shift
             ;;
         esac