diff --git a/.github/workflows/composites/maven-build-with-dry-run-for-tests/action.yaml b/.github/workflows/composites/maven-build-with-dry-run-for-tests/action.yaml
index aec179be..6a3712be 100644
--- a/.github/workflows/composites/maven-build-with-dry-run-for-tests/action.yaml
+++ b/.github/workflows/composites/maven-build-with-dry-run-for-tests/action.yaml
@@ -8,7 +8,7 @@ runs:
       run: |
           # find all the tests that are supposed to be run, but don't actually run them.
           # this is achieved via: 'spring.cloud.k8s.skip.tests=true' in DisabledTestsCondition
-          ./mvnw clean install -Dskip.build.image=true -Dspring.cloud.k8s.skip.tests=true \
+          ./mvnw clean install -B -Dskip.build.image=true -Dspring.cloud.k8s.skip.tests=true \
                 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=error \
                 -T 1C > /tmp/tests.txt
 
diff --git a/.github/workflows/composites/test-bounds/action.yaml b/.github/workflows/composites/test-bounds/action.yaml
index 3fa4949d..a9a1738b 100644
--- a/.github/workflows/composites/test-bounds/action.yaml
+++ b/.github/workflows/composites/test-bounds/action.yaml
@@ -6,7 +6,7 @@ runs:
     - name: test-bounds
       shell: bash
       run: |
-        PLAIN_TEST_CLASSNAMES=($(cat /tmp/tests.txt | grep 'spring.cloud.k8s.test.to.run' | awk '{print $3}'))
+        PLAIN_TEST_CLASSNAMES=($(cat /tmp/tests.txt | grep -o 'spring.cloud.k8s.test.to.run -> org.*' | awk '{print $3}'))
         NUMBER_OF_TESTS=${#PLAIN_TEST_CLASSNAMES[@]}
         
         echo "current index : ${CURRENT_INDEX}"
diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
index 090fc540..1b1aecfc 100644
--- a/.github/workflows/maven.yaml
+++ b/.github/workflows/maven.yaml
@@ -125,7 +125,7 @@ jobs:
           CURRENT_INDEX: ${{ matrix.current_index }}
         run: |
           
-            PLAIN_TEST_CLASSNAMES=($(cat /tmp/tests.txt | grep 'spring.cloud.k8s.test.to.run' | awk '{print $3}'))
+            PLAIN_TEST_CLASSNAMES=($(cat /tmp/tests.txt | grep -o 'spring.cloud.k8s.test.to.run -> org.*' | awk '{print $3}'))
             IFS=$'\n'
             SORTED_TEST_CLASSNAMES=( $(sort <<< "${PLAIN_TEST_CLASSNAMES[*]}") )
             unset IFS