diff --git a/js/src/jit-test/tests/wasm/gc/binary.js b/js/src/jit-test/tests/wasm/gc/binary.js
index 577502f4b7a4..0ff6f5d71154 100644
--- a/js/src/jit-test/tests/wasm/gc/binary.js
+++ b/js/src/jit-test/tests/wasm/gc/binary.js
@@ -1,4 +1,4 @@
-// |jit-test| skip-if: !wasmGcEnabled()
+// |jit-test| skip-if: !wasmReftypesEnabled() || !wasmGcEnabled()
 
 load(libdir + "wasm-binary.js");
 
@@ -18,7 +18,7 @@ const invalidRefBlockType = funcBody({locals:[], body:[
     0x42,
     EndCode,
 ]});
-checkInvalid(invalidRefBlockType, /ref/);
+checkInvalid(invalidRefBlockType, /heap type/);
 
 const invalidTooBigRefType = funcBody({locals:[], body:[
     BlockCode,
@@ -26,4 +26,4 @@ const invalidTooBigRefType = funcBody({locals:[], body:[
     varU32(1000000),
     EndCode,
 ]});
-checkInvalid(invalidTooBigRefType, /ref/);
+checkInvalid(invalidTooBigRefType, /heap type/);
diff --git a/js/src/jit-test/tests/wasm/gc/disabled.js b/js/src/jit-test/tests/wasm/gc/disabled.js
index e8cf8a0a9379..2403bae9fb53 100644
--- a/js/src/jit-test/tests/wasm/gc/disabled.js
+++ b/js/src/jit-test/tests/wasm/gc/disabled.js
@@ -2,7 +2,7 @@
 
 const { CompileError, validate } = WebAssembly;
 
-const UNRECOGNIZED_OPCODE_OR_BAD_TYPE = /unrecognized opcode|(Structure|reference) types not enabled|invalid inline block type|bad type|\(ref T\) types not enabled|Cranelift error in clifFunc/;
+const UNRECOGNIZED_OPCODE_OR_BAD_TYPE = /unrecognized opcode|(Structure|reference|gc) types not enabled|invalid heap type|invalid inline block type|bad type|\(ref T\) types not enabled|Cranelift error in clifFunc/;
 
 let simpleTests = [
     "(module (func (drop (ref.null any))))",
diff --git a/js/src/jit-test/tests/wasm/ref-types/ref-func.js b/js/src/jit-test/tests/wasm/ref-types/ref-func.js
index 5065c107038b..edd51e560128 100644
--- a/js/src/jit-test/tests/wasm/ref-types/ref-func.js
+++ b/js/src/jit-test/tests/wasm/ref-types/ref-func.js
@@ -118,7 +118,7 @@ assertErrorMessage(() => new WebAssembly.Module(
                                               typeCode: I32Code,
                                               elems: [] }])])),
                    WebAssembly.CompileError,
-                   /segments with element expressions can only contain references/);
+                   /bad type/);
 
 // Test case for bug 1596026: when taking the ref.func of an imported function,
 // the value obtained should not be the JS function.  This would assert (even in
@@ -168,7 +168,7 @@ function checkPassiveElemSegment(mangle, err) {
 }
 
 checkPassiveElemSegment("");
-checkPassiveElemSegment("type", /segments with element expressions can only contain references/);
+checkPassiveElemSegment("type", /bad type/);
 checkPassiveElemSegment("ref.func", /failed to read initializer operation/);
 checkPassiveElemSegment("end", /failed to read end of initializer expression/);