diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bd26364..cd992c1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -500,19 +500,21 @@ jobs:
           ninja
           ninja check-openmp
 
-  # Run the compiler-rt tests with the cross-built i686/x86_64 toolchains from
-  # above. This also forces testing the bundled python executables.
+  # Run the compiler-rt tests with the cross-built toolchains from above. This
+  # also forces testing the bundled python executables.
   test-compiler-rt:
     # Only running these tests in scheduled builds.
     if: (github.event_name == 'schedule') && (github.repository == 'mstorsjo/llvm-mingw')
     needs: [linux-cross-windows, prepare]
-    runs-on: windows-latest
     strategy:
       fail-fast: false
       matrix:
         arch:
           - x86_64
           - i686
+          - armv7
+          - aarch64
+    runs-on: ${{startsWith(matrix.arch, 'a') && 'windows-11-arm' || 'windows-latest'}}
     steps:
       - name: Install dependencies
         run: |