diff --git a/tests/compat.sh b/tests/compat.sh
index f915ea187..861d20e10 100755
--- a/tests/compat.sh
+++ b/tests/compat.sh
@@ -926,6 +926,15 @@ run_client() {
             cp $SRV_OUT c-srv-${TESTS}.log
             cp $CLI_OUT c-cli-${TESTS}.log
             echo "  ! outputs saved to c-srv-${TESTS}.log, c-cli-${TESTS}.log"
+
+            if [ "X${USER:-}" = Xbuildbot -o "X${LOGNAME:-}" = Xbuildbot ]; then
+                echo "  ! server output:"
+                cat c-srv-${TESTS}.log
+                echo "  ! ==================================================="
+                echo "  ! client output:"
+                cat c-cli-${TESTS}.log
+            fi
+
             FAILED=$(( $FAILED + 1 ))
             ;;
     esac
diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index e39320bd6..4eafed436 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -113,6 +113,14 @@ fail() {
     mv $CLI_OUT o-cli-${TESTS}.log
     echo "  ! outputs saved to o-srv-${TESTS}.log and o-cli-${TESTS}.log"
 
+    if [ "X${USER:-}" = Xbuildbot -o "X${LOGNAME:-}" = Xbuildbot ]; then
+        echo "  ! server output:"
+        cat o-srv-${TESTS}.log
+        echo "  ! ============================================================"
+        echo "  ! client output:"
+        cat o-cli-${TESTS}.log
+    fi
+
     FAILS=$(( $FAILS + 1 ))
 }