diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d6e194916b..3d24108084 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -31,6 +31,9 @@ jobs:
             ${{ runner.os }}-gradle-
       - name: Run unit tests
         run: ./gradlew clean test $CI_GRADLE_ARG_PROPERTIES -PallWarningsAsErrors=false --stacktrace
+      - name: Format unit test results
+        if: always()
+        run: python3 ./tools/ci/render_test_output.py unit ./**/build/test-results/**/*.xml
       - name: Publish Unit Test Results
         uses: EnricoMi/publish-unit-test-result-action@v1
         if: always() &&
diff --git a/tools/ci/render_test_output.py b/tools/ci/render_test_output.py
index 48dd3987a3..1e7940ce04 100755
--- a/tools/ci/render_test_output.py
+++ b/tools/ci/render_test_output.py
@@ -9,11 +9,10 @@ import sys
 import xml.etree.ElementTree as ET
 suitename = sys.argv[1]
 xmlfiles = sys.argv[2:]
-
-print(f"Arguments: {sys.argv}") 
-
+print("::group::Arguments")
+print(f"{sys.argv}") 
+print("::endgroup::")
 for xmlfile in xmlfiles:
-    print(f"Handling: {xmlfile}") 
     tree = ET.parse(xmlfile)
     
     root = tree.getroot()