--- a/js/src/jit-test/jit_test.py
+++ b/js/src/jit-test/jit_test.py
@@ -190,16 +190,17 @@ def main(argv):
         options.read_tests = options.retest
         options.write_failures = options.retest
 
     test_list = []
     read_all = True
 
     # Forbid running several variants of the same asmjs test, when debugging.
     options.can_test_also_noasmjs = not options.debugger
+    options.can_test_also_wasm_baseline = not options.debugger
 
     if test_args:
         read_all = False
         for arg in test_args:
             test_list += jittests.find_tests(arg)
 
     if options.read_tests:
         read_all = False

--- a/js/src/tests/lib/jittests.py
+++ b/js/src/tests/lib/jittests.py
@@ -218,17 +218,18 @@ class JitTest:
                     elif name == 'test-also-noasmjs':
                         if options.can_test_also_noasmjs:
                             test.test_also.append(['--no-asmjs'])
                             # test-also-noasmjs is a sure indicator that the file contains asm.js code;
                             # in that case we want to test the wasm baseline compiler too, as asm.js
                             # is translated to wasm
                             test.test_also.append(['--wasm-always-baseline'])
                     elif name == 'test-also-wasm-baseline':
-                        test.test_also.append(['--wasm-always-baseline'])
+                        if options.can_test_also_wasm_baseline:
+                            test.test_also.append(['--wasm-always-baseline'])
                     elif name.startswith('test-also='):
                         test.test_also.append([name[len('test-also='):]])
                     elif name.startswith('test-join='):
                         test.test_join.append([name[len('test-join='):]])
                     elif name == 'module':
                         test.is_module = True
                     elif name.startswith('--'):
                         # // |jit-test| --ion-gvn=off; --no-sse4