diff --git a/infra/base-images/base-runner/test_all b/infra/base-images/base-runner/test_all
index f3ff91497..b39e3cac8 100755
--- a/infra/base-images/base-runner/test_all
+++ b/infra/base-images/base-runner/test_all
@@ -32,12 +32,13 @@ for FUZZER_BINARY in $(find $OUT/ -executable -type f); do
 
   TIMESTAMP=$(date --iso-8601=seconds)
   HOSTNAME=$(hostname)
+  TESTNAME="${TEST_SUITE:-}$FUZZER"
 
   REPORT_TEXT=$(cat <<-EOF
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="${TEST_SUITE:-}$FUZZER" tests="1" skipped="0" failures="0" errors="0" timestamp="$TIMESTAMP" hostname="$HOSTNAME" time="1">
+<testsuite name="$TESTNAME" tests="1" skipped="0" failures="0" errors="0" timestamp="$TIMESTAMP" hostname="$HOSTNAME" time="1">
   <properties/>
-  <testcase name="$FUZZER" classname="$FUZZER" time="1"/>
+  <testcase name="$TESTNAME" classname="$TESTNAME" time="1"/>
   <system-out><![CDATA[]]></system-out>
   <system-err><![CDATA[]]></system-err>
 </testsuite>