diff --git a/test/benchmarks/benchmarks.status b/test/benchmarks/benchmarks.status
index 3009390bfb..bb87cc6dba 100644
--- a/test/benchmarks/benchmarks.status
+++ b/test/benchmarks/benchmarks.status
@@ -54,4 +54,9 @@
   'octane/splay': [SKIP],
   'octane/typescript': [SKIP],
 }],  # 'gc_fuzzer'
+
+##############################################################################
+['variant == jitless and not embedded_builtins', {
+  '*': [SKIP],
+}], # variant == jitless and not embedded_builtins
 ]
diff --git a/test/cctest/cctest.status b/test/cctest/cctest.status
index b83b209384..1259f1792c 100644
--- a/test/cctest/cctest.status
+++ b/test/cctest/cctest.status
@@ -627,4 +627,9 @@
   'test-macro-assembler-arm/ReplaceLane': [PASS, ['arch == arm and not simulator_run', SKIP]],
 }], # variant == jitless
 
+##############################################################################
+['variant == jitless and not embedded_builtins', {
+  '*': [SKIP],
+}], # variant == jitless and not embedded_builtins
+
 ]
diff --git a/test/debugger/debugger.status b/test/debugger/debugger.status
index e3cd614b71..668928137b 100644
--- a/test/debugger/debugger.status
+++ b/test/debugger/debugger.status
@@ -140,4 +140,9 @@
   'debug/regress/regress-crbug-633999': [SKIP],
 }], # variant == jitless
 
+##############################################################################
+['variant == jitless and not embedded_builtins', {
+  '*': [SKIP],
+}], # variant == jitless and not embedded_builtins
+
 ]
diff --git a/test/fuzzer/fuzzer.status b/test/fuzzer/fuzzer.status
index 65e51c238b..5a79a0171f 100644
--- a/test/fuzzer/fuzzer.status
+++ b/test/fuzzer/fuzzer.status
@@ -13,4 +13,9 @@
   'wasm_compile/*': [SKIP],
 }], # lite_mode or variant == jitless
 
+##############################################################################
+['variant == jitless and not embedded_builtins', {
+  '*': [SKIP],
+}], # variant == jitless and not embedded_builtins
+
 ]
diff --git a/test/inspector/inspector.status b/test/inspector/inspector.status
index 0a2a83b2c7..4b7c312785 100644
--- a/test/inspector/inspector.status
+++ b/test/inspector/inspector.status
@@ -81,4 +81,9 @@
   'debugger/pause-on-oom': [SKIP],
 }],
 
+##############################################################################
+['variant == jitless and not embedded_builtins', {
+  '*': [SKIP],
+}], # variant == jitless and not embedded_builtins
+
 ]
diff --git a/test/intl/intl.status b/test/intl/intl.status
index 4f3387ab22..53f42e4b66 100644
--- a/test/intl/intl.status
+++ b/test/intl/intl.status
@@ -62,4 +62,9 @@
   # Unable to change locale and TZ on Android:
   'regress-7770': [SKIP],
 }],  # 'system == android'
+
+##############################################################################
+['variant == jitless and not embedded_builtins', {
+  '*': [SKIP],
+}], # variant == jitless and not embedded_builtins
 ]
diff --git a/test/message/message.status b/test/message/message.status
index efffa6e44c..25c87b5e5c 100644
--- a/test/message/message.status
+++ b/test/message/message.status
@@ -64,4 +64,9 @@
   'asm-*': [SKIP],
 }], # lite_mode or variant == jitless
 
+##############################################################################
+['variant == jitless and not embedded_builtins', {
+  '*': [SKIP],
+}], # variant == jitless and not embedded_builtins
+
 ]
diff --git a/test/mjsunit/mjsunit.status b/test/mjsunit/mjsunit.status
index 70b62a8bfa..fba61c2a9c 100644
--- a/test/mjsunit/mjsunit.status
+++ b/test/mjsunit/mjsunit.status
@@ -1158,4 +1158,9 @@
   'regress/regress-913844': [SKIP],
 }],
 
+##############################################################################
+['variant == jitless and not embedded_builtins', {
+  '*': [SKIP],
+}], # variant == jitless and not embedded_builtins
+
 ]
diff --git a/test/mkgrokdump/mkgrokdump.status b/test/mkgrokdump/mkgrokdump.status
index 110cf6d15e..62453ad979 100644
--- a/test/mkgrokdump/mkgrokdump.status
+++ b/test/mkgrokdump/mkgrokdump.status
@@ -9,4 +9,9 @@
   '*': [SKIP],
 }],  # variant != default or arch != x64 or lite_mode
 
+##############################################################################
+['variant == jitless and not embedded_builtins', {
+  '*': [SKIP],
+}], # variant == jitless and not embedded_builtins
+
 ]
diff --git a/test/mozilla/mozilla.status b/test/mozilla/mozilla.status
index c7dd68db3b..4fef899227 100644
--- a/test/mozilla/mozilla.status
+++ b/test/mozilla/mozilla.status
@@ -1037,4 +1037,9 @@
   '*': [SKIP],
 }],  # variant == no_wasm_traps
 
+##############################################################################
+['variant == jitless and not embedded_builtins', {
+  '*': [SKIP],
+}], # variant == jitless and not embedded_builtins
+
 ]
diff --git a/test/preparser/preparser.status b/test/preparser/preparser.status
index 43049d46e0..792c416433 100644
--- a/test/preparser/preparser.status
+++ b/test/preparser/preparser.status
@@ -28,4 +28,9 @@
 [
 [ALWAYS, {
 }],  # ALWAYS
+
+##############################################################################
+['variant == jitless and not embedded_builtins', {
+  '*': [SKIP],
+}], # variant == jitless and not embedded_builtins
 ]
diff --git a/test/test262/test262.status b/test/test262/test262.status
index f4df5bd6cc..a1237a0848 100644
--- a/test/test262/test262.status
+++ b/test/test262/test262.status
@@ -1278,4 +1278,9 @@
   'intl402/DateTimeFormat/prototype/resolvedOptions/basic': [SKIP],
 }],  # system == windows
 
+##############################################################################
+['variant == jitless and not embedded_builtins', {
+  '*': [SKIP],
+}], # variant == jitless and not embedded_builtins
+
 ]
diff --git a/test/unittests/unittests.status b/test/unittests/unittests.status
index 1b40d02b63..a105afe987 100644
--- a/test/unittests/unittests.status
+++ b/test/unittests/unittests.status
@@ -29,4 +29,9 @@
   'Parameterized/WasmCodeManagerTest.*': [SKIP],
 }], # lite_mode or variant == jitless
 
+##############################################################################
+['variant == jitless and not embedded_builtins', {
+  '*': [SKIP],
+}], # variant == jitless and not embedded_builtins
+
 ]
diff --git a/test/wasm-js/wasm-js.status b/test/wasm-js/wasm-js.status
index 16de4f9822..51961fd46d 100644
--- a/test/wasm-js/wasm-js.status
+++ b/test/wasm-js/wasm-js.status
@@ -20,4 +20,9 @@
   '*': [SKIP],
 }], # lite_mode or variant == jitless
 
+##############################################################################
+['variant == jitless and not embedded_builtins', {
+  '*': [SKIP],
+}], # variant == jitless and not embedded_builtins
+
 ]
diff --git a/test/wasm-spec-tests/wasm-spec-tests.status b/test/wasm-spec-tests/wasm-spec-tests.status
index 4fbe5c2704..1953efae0a 100644
--- a/test/wasm-spec-tests/wasm-spec-tests.status
+++ b/test/wasm-spec-tests/wasm-spec-tests.status
@@ -49,5 +49,10 @@
   '*': [SKIP],
 }], # lite_mode or variant == jitless
 
+##############################################################################
+['variant == jitless and not embedded_builtins', {
+  '*': [SKIP],
+}], # variant == jitless and not embedded_builtins
+
 
 ]
diff --git a/test/webkit/webkit.status b/test/webkit/webkit.status
index d5dac2ba9d..53d0c3b167 100644
--- a/test/webkit/webkit.status
+++ b/test/webkit/webkit.status
@@ -131,5 +131,10 @@
   'fast/js/string-capitalization': [FAIL],
 }],  # variant == no_wasm_traps
 
+##############################################################################
+['variant == jitless and not embedded_builtins', {
+  '*': [SKIP],
+}], # variant == jitless and not embedded_builtins
+
 ##############################################################################
 ]