diff --git a/.github/workflows/scripts/qemu-7-prepare.sh b/.github/workflows/scripts/qemu-7-prepare.sh
index 4e2583731d70..a5fbd7213161 100755
--- a/.github/workflows/scripts/qemu-7-prepare.sh
+++ b/.github/workflows/scripts/qemu-7-prepare.sh
@@ -18,6 +18,7 @@ if [ -z ${VMs:-} ]; then
   cd $RESPATH
   echo ":exclamation: ZFS module didn't build successfully :exclamation:" \
     | tee summary.txt | tee /tmp/summary.txt
+  cp /var/tmp/*.txt .
   tar cf /tmp/qemu-$OS.tar -C $RESPATH -h . || true
   exit 0
 fi
diff --git a/.github/workflows/scripts/qemu-9-summary-page.sh b/.github/workflows/scripts/qemu-9-summary-page.sh
index 036004882fec..2f4c21f9910a 100755
--- a/.github/workflows/scripts/qemu-9-summary-page.sh
+++ b/.github/workflows/scripts/qemu-9-summary-page.sh
@@ -34,13 +34,14 @@ function send2github() {
 if [ ! -f out-1.md ]; then
   logfile="1"
   for tarfile in Logs-functional-*/qemu-*.tar; do
+    rm -rf vm* *.txt
     if [ ! -s "$tarfile" ]; then
       output "\n## Functional Tests: unknown\n"
       output ":exclamation: Tarfile $tarfile is empty :exclamation:"
       continue
     fi
-    rm -rf vm* *.txt
     tar xf "$tarfile"
+    test -s env.txt || continue
     source env.txt
     output "\n## Functional Tests: $OSNAME\n"
     outfile_plain uname.txt