diff --git a/master/master.cfg b/master/master.cfg
index 03ad7e3b..b9f98f7c 100644
--- a/master/master.cfg
+++ b/master/master.cfg
@@ -1177,22 +1177,44 @@ def get_test_labels(builder_type):
                 ['internal', 'correctness', 'generator', 'error', 'warning'])
 
     if builder_type.handles_wasm():
-        if builder_type.handles_wasm_wabt():
-            # TODO: this is a horrid hack. For now, we want to test JIT with both WABT and V8.
-            # Add as a horrible wart on the target string.
-            targets['wasm-32-wasmrt-wasm_simd128-wasm_signext-wasm_sat_float_to_int/wabt'].extend(
-                ['internal', 'correctness', 'generator', 'error', 'warning'])
-
-        if builder_type.handles_wasm_v8():
-            # TODO: this is a horrid hack. For now, we want to test JIT with both WABT and V8.
-            # Add as a horrible wart on the target string.
-            targets['wasm-32-wasmrt-wasm_simd128-wasm_signext-wasm_sat_float_to_int/v8'].extend(
-                ['internal', 'correctness', 'generator', 'error', 'warning'])
-
-        # WABT (and thus WASM JIT) can't handle code build with wasm_threads yet,
-        # so only test Generator here
-        targets['wasm-32-wasmrt-wasm_simd128-wasm_signext-wasm_sat_float_to_int-wasm_threads'].extend(
-            ['generator', 'apps'])
+        if builder_type.halide_branch.version.major < 17:
+            if builder_type.handles_wasm_wabt():
+                # TODO: this is a horrid hack. For now, we want to test JIT with both WABT and V8.
+                # Add as a horrible wart on the target string.
+                targets['wasm-32-wasmrt-wasm_simd128-wasm_signext-wasm_sat_float_to_int/wabt'].extend(
+                    ['internal', 'correctness', 'generator', 'error', 'warning'])
+
+            if builder_type.handles_wasm_v8():
+                # TODO: this is a horrid hack. For now, we want to test JIT with both WABT and V8.
+                # Add as a horrible wart on the target string.
+                targets['wasm-32-wasmrt-wasm_simd128-wasm_signext-wasm_sat_float_to_int/v8'].extend(
+                    ['internal', 'correctness', 'generator', 'error', 'warning'])
+
+            # WABT (and thus WASM JIT) can't handle code build with wasm_threads yet,
+            # so only test Generator here
+            targets['wasm-32-wasmrt-wasm_simd128-wasm_signext-wasm_sat_float_to_int-wasm_threads'].extend(
+                ['generator', 'apps'])
+        else :
+            if builder_type.handles_wasm_wabt():
+                # TODO: this is a horrid hack. For now, we want to test JIT with both WABT and V8.
+                # Add as a horrible wart on the target string.
+                targets['wasm-32-wasmrt-wasm_simd128/wabt'].extend(
+                    ['internal', 'correctness', 'generator', 'error', 'warning'])
+
+                # Do at least some testing with "baseline only" wasm"
+                targets['wasm-32-wasmrt-wasm_mvponly/wabt'].extend(
+                    ['internal', 'correctness', 'generator', 'error', 'warning'])
+
+            if builder_type.handles_wasm_v8():
+                # TODO: this is a horrid hack. For now, we want to test JIT with both WABT and V8.
+                # Add as a horrible wart on the target string.
+                targets['wasm-32-wasmrt-wasm_simd128/v8'].extend(
+                    ['internal', 'correctness', 'generator', 'error', 'warning'])
+
+            # WABT (and thus WASM JIT) can't handle code build with wasm_threads yet,
+            # so only test Generator here
+            targets['wasm-32-wasmrt-wasm_simd128-wasm_threads'].extend(
+                ['generator', 'apps'])
 
     if builder_type.handles_webgpu():
         # Most apps can't handle wasm builds yet.