diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 550de4b5..4d0b031b 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -20,6 +20,35 @@ jobs:
 #          - macos-latest
           - ubuntu-latest
           - windows-latest
+		suite:
+		  - core-app
+		  - core-apps
+		  - core-autopatch
+		  - core-compat
+		  - core-deps
+		  - core-makedep
+		  - core-misc
+		  - core-plugins
+		  - core-query
+		  - core-upgrade
+		  - asciidoc
+		  - bootstrap
+		  - concuerror
+		  - cover
+		  - c-src
+		  - ct
+		  - dialyzer
+		  - edoc
+		  - erlydtl
+		  - escript
+		  - eunit
+		  - hex
+		  - proper
+		  - protobuffs
+		  - relx
+		  - shell
+		  - sphinx
+		  - xref
         extra: ['', 'LEGACY=1']
     runs-on: ${{ matrix.os }}
 
@@ -48,17 +77,17 @@ jobs:
 
     - name: Run tests (Linux)
       if: matrix.os == 'ubuntu-latest'
-      run: make check -k ${{ matrix.extra }}
+      run: make check c=${{ matrix.suite }} -k ${{ matrix.extra }}
 
     - name: Run tests (Windows)
       if: matrix.os == 'windows-latest'
       shell: msys2 {0}
-      run: PATH=$INSTALL_DIR_FOR_OTP/bin:$PATH make check -k ${{ matrix.extra }}
+      run: PATH=$INSTALL_DIR_FOR_OTP/bin:$PATH make check c=${{ matrix.suite }} -k ${{ matrix.extra }}
 
     - name: Upload artifacts
       if: failure()
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ matrix.os }} OTP-${{ matrix.erlang }} ${{ matrix.extra }}
+        name: ${{ matrix.os }} OTP-${{ matrix.erlang }} ${{ matrix.suite }} ${{ matrix.extra }}
         path: |
           test/test_*/