diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 363ef8566e..2eba0823ba 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -32,6 +32,9 @@ jobs:
         test_task: ['check']
         configure: ['']
         os: ${{ fromJSON(format('["macos-11","macos-12"{0}]', (github.repository == 'ruby/ruby' && ',"macos-arm-oss"' || ''))) }}
+        include:
+          - test_task: test-all TESTS=--repeat-count=2
+            os: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-12' }}
       fail-fast: false
 
     env:
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index dfd800ea61..91f970009e 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -40,7 +40,6 @@ jobs:
             configure: '--disable-yjit'
           - test_task: check
             configure: '--enable-shared --enable-load-relative'
-          - test_task: test-all TESTS=--repeat-count=2
           - test_task: test-bundler-parallel
           - test_task: test-bundled-gems
       fail-fast: false