diff --git a/.github/workflows/pinot_tests.yml b/.github/workflows/pinot_tests.yml
index 844b7bd6fe8e..a6cd2ad6dd20 100644
--- a/.github/workflows/pinot_tests.yml
+++ b/.github/workflows/pinot_tests.yml
@@ -115,7 +115,7 @@ jobs:
         continue-on-error: true
         timeout-minutes: 5
         with:
-          flags: unittests${{ matrix.testset }}${{matrix.distribution}}${{matrix.java}}
+          flags: unittests${{ matrix.testset }},${{matrix.distribution}},java-${{matrix.java}}
           name: codecov-unit-tests
           fail_ci_if_error: false
           verbose: true
@@ -167,7 +167,7 @@ jobs:
         continue-on-error: true
         timeout-minutes: 5
         with:
-          flags: integration${{ matrix.testset }}${{matrix.distribution}}${{matrix.java}}
+          flags: integration${{ matrix.testset }},${{matrix.distribution}},java-${{matrix.java}}
           name: codecov-integration-tests
           fail_ci_if_error: false
           verbose: true
diff --git a/pom.xml b/pom.xml
index 3a179c29f73f..33165a14f4b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1405,7 +1405,6 @@
           <artifactId>maven-surefire-plugin</artifactId>
           <version>3.0.0-M5</version>
           <configuration>
-            <!-- Do not set argLine here, it will break the code coverage plugin. Set it in the properties section. -->
             <forkCount>1</forkCount>
             <reuseForks>false</reuseForks>
             <!-- 60 minutes -->
@@ -1417,7 +1416,7 @@
             <trimStackTrace>false</trimStackTrace>
             <reportFormat>plain</reportFormat>
             <argLine>
-              ${argLine}
+              @{argLine}
               --add-opens=java.base/java.nio=ALL-UNNAMED
               --add-opens=java.base/sun.nio.ch=ALL-UNNAMED
               --add-opens=java.base/java.lang=ALL-UNNAMED