diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d8fb781a..67358485 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -60,6 +60,7 @@ jobs:
     - name: Test GORM
       shell: bash
       run: gormlite/test.sh
+      if: matrix.os != 'windows-latest'
 
     - name: Test modules
       shell: bash
@@ -86,22 +87,27 @@ jobs:
         os:
           - name: freebsd
             version: '14.2'
+            runner: ubuntu-latest
             flags: '-test.v'
           - name: netbsd
             version: '10.0'
+            runner: ubuntu-latest
             flags: '-test.v'
           - name: freebsd
             arch: arm64
             version: '14.2'
-            flags: '-test.v -test.short'
+            runner: ubuntu-24.04-arm
+            flags: '-test.v'
           - name: netbsd
             arch: arm64
             version: '10.0'
-            flags: '-test.v -test.short'
+            runner: ubuntu-24.04-arm
+            flags: '-test.v'
           - name: openbsd
             version: '7.6'
+            runner: ubuntu-latest
             flags: '-test.v -test.short'
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os.runner }}
     needs: test
 
     steps:
@@ -193,9 +199,6 @@ jobs:
     - name: Test 386 (32-bit)
       run: GOARCH=386 go test -v -short ./...
 
-    - name: Test arm64 (compiler)
-      run: GOARCH=arm64 go test -v -short ./...
-
     - name: Test riscv64 (interpreter)
       run: GOARCH=riscv64 go test -v -short ./...
 
@@ -205,6 +208,18 @@ jobs:
     - name: Test s390x (big-endian)
       run: GOARCH=s390x go test -v -short -tags sqlite3_dotlk ./...
 
+  test-linuxarm:
+    runs-on: ubuntu-24.04-arm
+    needs: test
+
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-go@v5
+      with: { go-version: stable }
+
+    - name: Test
+      run: go test -v ./...
+
   test-macintel:
     runs-on: macos-13
     needs: test