diff --git a/tests/runner.pm b/tests/runner.pm
index 14acbcdd92..d003a334e3 100644
--- a/tests/runner.pm
+++ b/tests/runner.pm
@@ -939,7 +939,12 @@ sub singletest_run {
         $CMDLINE=exerunner() . $CMDLINE;
 
         if($bundle) {
-            $CMDLINE.=" $tool_name";
+            if($gdbthis) {
+                $cmdargs =" $tool_name$cmdargs";
+            }
+            else {
+                $CMDLINE.=" $tool_name";
+            }
         }
 
         $DBGCURL=$CMDLINE;