diff --git a/.github/workflows/__linux-arm64.yml b/.github/workflows/__linux-arm64.yml
index 641099ebc..a1764426d 100644
--- a/.github/workflows/__linux-arm64.yml
+++ b/.github/workflows/__linux-arm64.yml
@@ -76,7 +76,6 @@ jobs:
         run: go build main.go
       - uses: ./../action/analyze
         with:
-          skip-queries: true
           upload-database: false
       - name: Assert databases exist
         run: |
diff --git a/pr-checks/checks/linux-arm64.yml b/pr-checks/checks/linux-arm64.yml
index d254799ba..94e03da17 100644
--- a/pr-checks/checks/linux-arm64.yml
+++ b/pr-checks/checks/linux-arm64.yml
@@ -18,7 +18,6 @@ steps:
     run: go build main.go
   - uses: ./../action/analyze
     with:
-      skip-queries: true
       upload-database: false
   - name: Assert databases exist
     run: |
diff --git a/src/cli-errors.test.ts b/src/cli-errors.test.ts
index 1a83def51..bb0e1b5d9 100644
--- a/src/cli-errors.test.ts
+++ b/src/cli-errors.test.ts
@@ -156,20 +156,34 @@ for (const [platform, arch] of [
   );
 }
 
-test("wrapCliConfigurationError - supported platform", (t) => {
-  const commandError = new CommandInvocationError(
-    "codeql",
-    ["version"],
-    1,
-    "Some error",
+for (const [platform, arch] of [
+  ["linux", "x64"],
+  ["linux", "arm64"],
+  ["win32", "x64"],
+  ["darwin", "x64"],
+  ["darwin", "arm64"],
+]) {
+  test.serial(
+    `wrapCliConfigurationError - ${platform}/${arch} supported`,
+    (t) => {
+      sinon.stub(process, "platform").value(platform);
+      sinon.stub(process, "arch").value(arch);
+      const commandError = new CommandInvocationError(
+        "codeql",
+        ["version"],
+        1,
+        "Some error",
+      );
+      const cliError = new CliError(commandError);
+
+      const wrappedError = wrapCliConfigurationError(cliError);
+
+      // Should return the original error since the platform is supported, rather
+      // than replacing it with the unsupported-platform ConfigurationError.
+      t.is(wrappedError, cliError);
+    },
   );
-  const cliError = new CliError(commandError);
-
-  const wrappedError = wrapCliConfigurationError(cliError);
-
-  // Should return the original error since platform is supported
-  t.is(wrappedError, cliError);
-});
+}
 
 test("wrapCliConfigurationError - autobuild error", (t) => {
   const commandError = new CommandInvocationError(