diff --git a/.github/workflows/test-java17.yml b/.github/workflows/test-java17.yml
index e6b1be0..2ec39e8 100644
--- a/.github/workflows/test-java17.yml
+++ b/.github/workflows/test-java17.yml
@@ -17,7 +17,10 @@ permissions:
 jobs:
   build:
     runs-on: ubuntu-latest
-    name: Build
+    name: Build (Java ${{ matrix.java-version }})
+    strategy:
+      matrix:
+        java-version: ['17', '21']
     timeout-minutes: 5
     defaults:
       run:
@@ -31,6 +34,6 @@ jobs:
       - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
         with:
           distribution: temurin
-          java-version: '17'
+          java-version: ${{ matrix.java-version }}
           cache: maven
       - run: ./mvnw test -q -Dtest=OptimalPortfolioScenarioTest