diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7887da8bd53f..4060dbd672a1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,33 +17,25 @@ jobs:
     strategy:
       # Create a matrix of two separate configurations for Unit vs Integration Tests
       # This will ensure those tasks are run in parallel
-      # Also ensure both are run for multiple versions of Java.
+      # Also specify version of Java to use (this can allow us to optionally run tests on multiple JDKs in future)
       matrix:
         include:
           # NOTE: Unit Tests include deprecated REST API v6 (as it has unit tests)
           #  - surefire.rerunFailingTestsCount => try again for flakey tests, and keep track of/report on number of retries
-          - type: "Unit Tests on Java 11"
+          - type: "Unit Tests"
             java: 11
             mvnflags: "-DskipUnitTests=false -Pdspace-rest -Dsurefire.rerunFailingTestsCount=2"
             resultsdir: "**/target/surefire-reports/**"
-          - type: "Unit Tests on Java 17"
-            java: 17
-            mvnflags: "-DskipUnitTests=false -Pdspace-rest -Dsurefire.rerunFailingTestsCount=2"
-            resultsdir: "**/target/surefire-reports/**"
           # NOTE: ITs skip all code validation checks, as they are already done by Unit Test job.
           #  - enforcer.skip     => Skip maven-enforcer-plugin rules
           #  - checkstyle.skip   => Skip all checkstyle checks by maven-checkstyle-plugin
           #  - license.skip      => Skip all license header checks by license-maven-plugin
           #  - xml.skip          => Skip all XML/XSLT validation by xml-maven-plugin
           #  - failsafe.rerunFailingTestsCount => try again for flakey tests, and keep track of/report on number of retries
-          - type: "Integration Tests on Java 11"
+          - type: "Integration Tests"
             java: 11
             mvnflags: "-DskipIntegrationTests=false -Denforcer.skip=true -Dcheckstyle.skip=true -Dlicense.skip=true -Dxml.skip=true -Dfailsafe.rerunFailingTestsCount=2"
             resultsdir: "**/target/failsafe-reports/**"
-          - type: "Integration Tests on Java 17"
-            java: 17
-            mvnflags: "-DskipIntegrationTests=false -Denforcer.skip=true -Dcheckstyle.skip=true -Dlicense.skip=true -Dxml.skip=true -Dfailsafe.rerunFailingTestsCount=2"
-            resultsdir: "**/target/failsafe-reports/**"
       # Do NOT exit immediately if one matrix job fails
       # This ensures ITs continue running even if Unit Tests fail, or visa versa
       fail-fast: false