diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index c216b2f0..4acd1a2c 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -59,6 +59,8 @@ jobs:
     needs: cpp-linters
     runs-on: [self-hosted, ARM64, Linux]
     container: python:3.11
+    # Run only when merging to develop (until we have a GitHub-hosted runner for Linux/ARM64)
+    if: github.ref == 'refs/heads/develop'
     strategy:
       fail-fast: false
       matrix:
@@ -320,6 +322,15 @@ jobs:
           ${{
                contains(needs.*.result, 'failure')
             || contains(needs.*.result, 'cancelled')
-            || contains(needs.*.result, 'skipped')
+            || (
+                    github.ref != 'refs/heads/develop'
+                 && contains(needs.*.result, 'skipped')
+                 && !contains(needs.cpp-linux-arm64.result, 'skipped')
+               )
+            ||
+               (
+                    github.ref == 'refs/heads/develop'
+                 && contains(needs.*.result, 'skipped')
+               )
           }}
         run: exit 1