diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bf5b6978ef..748380bdbe 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -293,14 +293,7 @@ jobs:
       if: matrix.target == ''
 
     # Build and test all features except for lightbeam
-    - run: |
-        cargo test \
-            --features test-programs/test_programs \
-            --workspace \
-            --exclude '*lightbeam*' \
-            --exclude 'wasmtime-wasi-*' \
-            --exclude 'peepmatic*' \
-            --exclude wasi-crypto
+    - run: ./ci/run-tests.sh --locked
       env:
         RUST_BACKTRACE: 1
 
@@ -349,7 +342,7 @@ jobs:
     - run: rustup target add wasm32-unknown-unknown
 
     # Run the old x86 backend CI (we will eventually remove this).
-    - run: ./ci/run-old-x86-ci.sh
+    - run: ./ci/run-tests.sh --features old-x86-backend --locked
       env:
         RUST_BACKTRACE: 1
 
diff --git a/ci/run-old-x86-ci.sh b/ci/run-old-x86-ci.sh
deleted file mode 100755
index 2f0983030a..0000000000
--- a/ci/run-old-x86-ci.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-cargo test \
-            --locked \
-            --features test-programs/test_programs \
-            --features old-x86-backend \
-            --all \
-            --exclude wasmtime-lightbeam \
-            --exclude wasmtime-wasi-nn \
-            --exclude wasmtime-wasi-crypto \
-            --exclude peepmatic \
-            --exclude peepmatic-automata \
-            --exclude peepmatic-fuzzing \
-            --exclude peepmatic-macro \
-            --exclude peepmatic-runtime \
-            --exclude peepmatic-test \
-            --exclude peepmatic-souper \
-            --exclude lightbeam
diff --git a/ci/run-tests.sh b/ci/run-tests.sh
new file mode 100755
index 0000000000..15b2cabc03
--- /dev/null
+++ b/ci/run-tests.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+cargo test \
+    --features "test-programs/test_programs" \
+    --workspace \
+    --exclude '*lightbeam*' \
+    --exclude 'wasmtime-wasi-*' \
+    --exclude 'peepmatic*' \
+    --exclude wasi-crypto \
+    $@