diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7ee1280..aff5904 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,8 +18,10 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        release: [R2021a, R2021b, R2022a, R2023a, R2023b, R2024a]
+        release: [R2021a, R2023a, R2023b, R2024a]
         include:
+        - os: ubuntu-24.04
+          release: latest-including-prereleases
         - os: macos-latest
           release: R2024a
         - os: windows-latest
@@ -34,13 +36,14 @@ jobs:
 
     - uses: actions/checkout@v4
 
+    # >= R2022b
     - name: Run Matlab tests (buildtool)
-      if: ${{ matrix.release >= 'R2022b' }}
+      if: ${{ matrix.release != 'R2021a' }}
       timeout-minutes: 10
       uses: matlab-actions/run-build@v2
 
     - name: Run tests (manual)
-      if: ${{ matrix.release < 'R2022b' }}
+      if: ${{ matrix.release == 'R2021a' }}
       timeout-minutes: 10
       uses: matlab-actions/run-tests@v2
       with: