diff --git a/build.rs b/build.rs
index 4baa936c3277..91d834221b6f 100644
--- a/build.rs
+++ b/build.rs
@@ -38,6 +38,11 @@ fn main() -> anyhow::Result<()> {
             // out.
             if spec_tests > 0 {
                 test_directory_module(out, "tests/spec_testsuite/proposals/memory64", strategy)?;
+                test_directory_module(
+                    out,
+                    "tests/spec_testsuite/proposals/multi-memory",
+                    strategy,
+                )?;
             } else {
                 println!(
                     "cargo:warning=The spec testsuite is disabled. To enable, run `git submodule \
@@ -167,26 +172,19 @@ fn write_testsuite_tests(
 
 /// Ignore tests that aren't supported yet.
 fn ignore(testsuite: &str, testname: &str, strategy: &str) -> bool {
-    match strategy {
-        "Cranelift" => match (testsuite, testname) {
+    assert_eq!(strategy, "Cranelift");
+    match env::var("CARGO_CFG_TARGET_ARCH").unwrap().as_str() {
+        "s390x" => {
             // FIXME: These tests fail under qemu due to a qemu bug.
-            (_, "simd_f32x4_pmin_pmax") if platform_is_s390x() => return true,
-            (_, "simd_f64x2_pmin_pmax") if platform_is_s390x() => return true,
-            // riscv64 backend does not yet have a fully complete SIMD backend.
-            ("simd", _) if platform_is_riscv64() => return true,
-            ("memory64", "simd") if platform_is_riscv64() => return true,
-            _ => {}
-        },
-        _ => panic!("unrecognized strategy"),
-    }
+            testname == "simd_f32x4_pmin_pmax" || testname == "simd_f64x2_pmin_pmax"
+        }
 
-    false
-}
+        // Currently the simd wasm proposal is not implemented in the riscv64
+        // backend so skip all tests which could use simd.
+        "riscv64" => {
+            testsuite == "simd" || testname.contains("simd") || testname.contains("memory_multi")
+        }
 
-fn platform_is_s390x() -> bool {
-    env::var("CARGO_CFG_TARGET_ARCH").unwrap() == "s390x"
-}
-
-fn platform_is_riscv64() -> bool {
-    env::var("CARGO_CFG_TARGET_ARCH").unwrap() == "riscv64"
+        _ => false,
+    }
 }
diff --git a/crates/wast/src/wast.rs b/crates/wast/src/wast.rs
index 6980a0317d65..a8460ab2c508 100644
--- a/crates/wast/src/wast.rs
+++ b/crates/wast/src/wast.rs
@@ -476,9 +476,6 @@ impl<T> WastContext<T> {
 
 fn is_matching_assert_invalid_error_message(expected: &str, actual: &str) -> bool {
     actual.contains(expected)
-        // `elem.wast` and `proposals/bulk-memory-operations/elem.wast` disagree
-        // on the expected error message for the same error.
-        || (expected.contains("out of bounds") && actual.contains("does not fit"))
         // slight difference in error messages
         || (expected.contains("unknown elem segment") && actual.contains("unknown element segment"))
         // The same test here is asserted to have one error message in
@@ -486,4 +483,7 @@ fn is_matching_assert_invalid_error_message(expected: &str, actual: &str) -> boo
         // `memory64/memory.wast`, so we equate these two error messages to get
         // the memory64 tests to pass.
         || (expected.contains("memory size must be at most 65536 pages") && actual.contains("invalid u32 number"))
+        // the spec test suite asserts a different error message than we print
+        // for this scenario
+        || (expected == "unknown global" && actual.contains("global.get of locally defined global"))
 }
diff --git a/tests/all/wast.rs b/tests/all/wast.rs
index e59b290e79eb..280c68779648 100644
--- a/tests/all/wast.rs
+++ b/tests/all/wast.rs
@@ -21,14 +21,12 @@ fn run_wast(wast: &str, strategy: Strategy, pooling: bool) -> anyhow::Result<()>
     }
     let wast = Path::new(wast);
 
-    let simd = feature_found(wast, "simd");
     let memory64 = feature_found(wast, "memory64");
     let multi_memory = feature_found(wast, "multi-memory");
     let threads = feature_found(wast, "threads");
 
     let mut cfg = Config::new();
-    cfg.wasm_simd(simd)
-        .wasm_multi_memory(multi_memory)
+    cfg.wasm_multi_memory(multi_memory)
         .wasm_threads(threads)
         .wasm_memory64(memory64)
         .cranelift_debug_verifier(true);
diff --git a/tests/spec_testsuite b/tests/spec_testsuite
index 4fd2339b5e97..4f77306bb631 160000
--- a/tests/spec_testsuite
+++ b/tests/spec_testsuite
@@ -1 +1 @@
-Subproject commit 4fd2339b5e9709e74b326797f69a88b13eac4d47
+Subproject commit 4f77306bb63151631d84f58dedf67958eb9911b9