diff --git a/.github/workflows/iceberg_spark_test.yml b/.github/workflows/iceberg_spark_test.yml
index c97445ea1d..1594568b26 100644
--- a/.github/workflows/iceberg_spark_test.yml
+++ b/.github/workflows/iceberg_spark_test.yml
@@ -120,10 +120,14 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-24.04]
-        java-version: [11, 17]
         iceberg-version: [{short: '1.8', full: '1.8.1'}, {short: '1.9', full: '1.9.1'}, {short: '1.10', full: '1.10.0'}]
         spark-version: [{short: '3.4', full: '3.4.3'}, {short: '3.5', full: '3.5.8'}]
         scala-version: ['2.13']
+        include:
+          - spark-version: {short: '3.4', full: '3.4.3'}
+            java-version: 11
+          - spark-version: {short: '3.5', full: '3.5.8'}
+            java-version: 17
       fail-fast: false
     name: iceberg-spark/${{ matrix.os }}/iceberg-${{ matrix.iceberg-version.full }}/spark-${{ matrix.spark-version.full }}/scala-${{ matrix.scala-version }}/java-${{ matrix.java-version }}
     runs-on: ${{ matrix.os }}
@@ -163,10 +167,14 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-24.04]
-        java-version: [11, 17]
         iceberg-version: [{short: '1.8', full: '1.8.1'}, {short: '1.9', full: '1.9.1'}, {short: '1.10', full: '1.10.0'}]
         spark-version: [{short: '3.4', full: '3.4.3'}, {short: '3.5', full: '3.5.8'}]
         scala-version: ['2.13']
+        include:
+          - spark-version: {short: '3.4', full: '3.4.3'}
+            java-version: 11
+          - spark-version: {short: '3.5', full: '3.5.8'}
+            java-version: 17
       fail-fast: false
     name: iceberg-spark-extensions/${{ matrix.os }}/iceberg-${{ matrix.iceberg-version.full }}/spark-${{ matrix.spark-version.full }}/scala-${{ matrix.scala-version }}/java-${{ matrix.java-version }}
     runs-on: ${{ matrix.os }}
@@ -206,10 +214,14 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-24.04]
-        java-version: [11, 17]
         iceberg-version: [{short: '1.8', full: '1.8.1'}, {short: '1.9', full: '1.9.1'}, {short: '1.10', full: '1.10.0'}]
         spark-version: [{short: '3.4', full: '3.4.3'}, {short: '3.5', full: '3.5.8'}]
         scala-version: ['2.13']
+        include:
+          - spark-version: {short: '3.4', full: '3.4.3'}
+            java-version: 11
+          - spark-version: {short: '3.5', full: '3.5.8'}
+            java-version: 17
       fail-fast: false
     name: iceberg-spark-runtime/${{ matrix.os }}/iceberg-${{ matrix.iceberg-version.full }}/spark-${{ matrix.spark-version.full }}/scala-${{ matrix.scala-version }}/java-${{ matrix.java-version }}
     runs-on: ${{ matrix.os }}