diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index 2ef600e1ec..1c2055d40e 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -55,28 +55,7 @@ jobs:
       - name: Maven Site
         env:
           MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
-        run: mvn -B  clean site -D enable-ci --file pom.xml
-  test-8:
-    name: test (${{ matrix.os }}, Java 8)
-    runs-on: ${{ matrix.os }}-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ ubuntu ]
-        java: [ 8 ]
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK
-      uses: actions/setup-java@v3
-      with:
-        java-version: ${{ matrix.java }}
-        distribution: 'temurin'
-        cache: 'maven'
-    # JDK 8
-    - name: Maven Install with Code Coverage
-      run: mvn -B clean install -D enable-ci -Djapicmp.skip --file pom.xml
-    - name: Codecov Report 
-      uses: codecov/codecov-action@v3.1.4
+        run: mvn -B clean site -D enable-ci --file pom.xml
   test:
     name: test (${{ matrix.os }}, Java ${{ matrix.java }})
     runs-on: ${{ matrix.os }}-latest
@@ -104,3 +83,16 @@ jobs:
       env:
         MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
       run: mvn -B clean install -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"
+    - name: Codecov Report 
+      if: matrix.os == 'ubuntu' && matrix.java == '17'
+      uses: codecov/codecov-action@v3.1.4
+    - name: Set up JDK
+      if: matrix.os == 'ubuntu' && matrix.java == '17'
+      uses: actions/setup-java@v3
+      with:
+        java-version: 8
+        distribution: 'temurin'
+        cache: 'maven'      
+    - name: Maven Test (no build) Java 8
+      if: matrix.os == 'ubuntu' && matrix.java == '17'
+      run: mvn -B surefire:test -Dsurefire.excludesFile=src/test/resources/slow-or-flaky-tests.txt
diff --git a/pom.xml b/pom.xml
index e2e018d310..801e3b9c85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -304,12 +304,14 @@
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>@{jacoco.surefire.argLine} ${surefire.argLine}</argLine>
+        </configuration>
         <executions>
           <execution>
             <id>default-test</id>
             <configuration>
               <excludesFile>src/test/resources/slow-or-flaky-tests.txt</excludesFile>
-              <argLine>@{jacoco.surefire.argLine} ${surefire.argLine}</argLine>
             </configuration>
           </execution>
         </executions>
@@ -651,7 +653,6 @@
                   <!-- There are some tests that take longer or are a little
                     flaky. Run them here. -->
                   <includesFile>src/test/resources/slow-or-flaky-tests.txt</includesFile>
-                  <argLine>@{jacoco.surefire.argLine} ${surefire.argLine}</argLine>
                 </configuration>
               </execution>
             </executions>