diff --git a/test_regress/driver.py b/test_regress/driver.py
index 654e88b6a..41b830149 100755
--- a/test_regress/driver.py
+++ b/test_regress/driver.py
@@ -2801,19 +2801,19 @@ if Args.debug:
     logging.basicConfig(level=logging.DEBUG)
     logging.info("In driver.py, ARGV=" + ' '.join(sys.argv))
 
+interactive_debugger = Args.gdb or Args.gdbsim or Args.rr or Args.rrsim
+if Args.jobs > 1 and interactive_debugger:
+    sys.exit("%Error: Unable to use -j > 1 with --gdb* and --rr* options")
+
 if Args.golden:
     os.environ['HARNESS_UPDATE_GOLDEN'] = '1'
 if Args.jobs == 0:
-    Args.jobs = calc_jobs()
+    Args.jobs = 1 if interactive_debugger else calc_jobs()
 if not Args.scenarios:
     Args.scenarios = []
     Args.scenarios.append('dist')
     Args.scenarios.append('vlt')
 
-interactive_debugger = Args.gdb or Args.gdbsim or Args.rr or Args.rrsim
-if Args.jobs > 1 and interactive_debugger:
-    sys.exit("%Error: Unable to use -j > 1 with --gdb* and --rr* options")
-
 forker = Forker(Args.jobs)
 
 Test_Dirs = ["t"]
diff --git a/test_regress/t/vltest_bootstrap.py b/test_regress/t/vltest_bootstrap.py
index 49684b191..b299e9207 100755
--- a/test_regress/t/vltest_bootstrap.py
+++ b/test_regress/t/vltest_bootstrap.py
@@ -14,4 +14,4 @@ os.chdir(os.path.dirname(os.path.realpath(__file__)) + "/..")
 # Avoid chdir leaving the .. which confuses later commands
 os.environ['PWD'] = os.getcwd()
 args = list(map(lambda arg: re.sub(r'.*/test_regress/', '', arg), sys.argv))
-os.execl("./driver.py", "--bootstrapped", *args)
+os.execl("./driver.py", "driver.py", *args)