diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh
index f5fbcd8..6a846ae 100755
--- a/tools/run-jdwp-tests.sh
+++ b/tools/run-jdwp-tests.sh
@@ -96,6 +96,14 @@
     # We don't care about jit with the RI
     use_jit=false
     shift
+  elif [[ $1 == --test-timeout-ms ]]; then
+    # Remove the --test-timeout-ms from the arguments.
+    args=${args/$1}
+    shift
+    jdwp_test_timeout=$1
+    # Remove the argument
+    args=${args/$1}
+    shift
   elif [[ $1 == --agent-wrapper ]]; then
     # Remove the --agent-wrapper from the arguments.
     args=${args/$1}