diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 7e077c32807..1b672158e66 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -76,14 +76,16 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-20.04 ]
+      matrix:
+        java_version: [ ${env.JAVA_VERSION}, latest ]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK ${{ env.JAVA_VERSION }}
+      - name: Set up JDK ${{ matrix.java_version }}
         uses: actions/setup-java@v4.1.0
         with:
           distribution: ${{ env.JAVA_DISTRO }}
-          java-version: ${{ env.JAVA_VERSION }}
+          java-version: ${{ matrix.java_version }}
           cache: maven
       - name: Maven build
         run: etc/scripts/github-build.sh
@@ -92,14 +94,16 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-20.04, macos-14 ]
+      matrix:
+        java_version: [ ${env.JAVA_VERSION}, latest ]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK ${{ env.JAVA_VERSION }}
+      - name: Set up JDK ${{ matrix.java_version }}
         uses: actions/setup-java@v4.1.0
         with:
           distribution: ${{ env.JAVA_DISTRO }}
-          java-version: ${{ env.JAVA_VERSION }}
+          java-version: ${{ matrix.java_version }}
           cache: maven
       - name: Maven build
         run: |
@@ -112,14 +116,16 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-20.04 ]
+      matrix:
+        java_version: [ ${env.JAVA_VERSION}, latest ]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK ${{ env.JAVA_VERSION }}
+      - name: Set up JDK ${{ matrix.java_version }}
         uses: actions/setup-java@v4.1.0
         with:
           distribution: ${{ env.JAVA_DISTRO }}
-          java-version: ${{ env.JAVA_VERSION }}
+          java-version: ${{ matrix.java_version }}
           cache: maven
       - name: Maven build
         run: etc/scripts/mp-tck.sh