diff --git a/.github/workflows/test-java17.yml b/.github/workflows/test-java17.yml
index 0b29037..930b015 100644
--- a/.github/workflows/test-java17.yml
+++ b/.github/workflows/test-java17.yml
@@ -12,7 +12,7 @@ jobs:
     name: Build (Java ${{ matrix.java-version }})
     strategy:
       matrix:
-        java-version: ['17', '21']
+        java-version: ['17', '21', '25']
     timeout-minutes: 5
     defaults:
       run:
diff --git a/.github/workflows/test-java8.yml b/.github/workflows/test-java8.yml
index 5058d5e..100acdf 100644
--- a/.github/workflows/test-java8.yml
+++ b/.github/workflows/test-java8.yml
@@ -9,7 +9,10 @@ permissions:
 jobs:
   build:
     runs-on: ubuntu-latest
-    name: Build
+    name: Build (Java ${{ matrix.java-version }})
+    strategy:
+      matrix:
+        java-version: ['8', '11']
     timeout-minutes: 5
     defaults:
       run:
@@ -23,7 +26,7 @@ jobs:
       - uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c # v5
         with:
           distribution: temurin
-          java-version: '8'
+          java-version: ${{ matrix.java-version }}
           cache: maven
       - run: ./mvnw test -q -Dtest=OptimalPortfolioScenarioTest
       - name: Order scenario test should fail at the rebalance assertion