diff --git a/tunneld/test.sh b/tunneld/test.sh
index 929395a..7b225b5 100755
--- a/tunneld/test.sh
+++ b/tunneld/test.sh
@@ -40,6 +40,13 @@
   "${go}" build veyron/tools/identity || fail "line ${LINENO}: failed to build identity"
 }
 
+dumplogs() {
+  for x in $*; do
+    echo "-- $(basename "${x}") --"
+    cat "${x}"
+  done
+}
+
 main() {
   cd "${workdir}"
   build
@@ -81,7 +88,7 @@
   local want="HELLO ENDPOINT"
 
   if [[ "${got}" != "${want}" ]]; then
-    cat "${vshlog}"
+    dumplogs "${vshlog}" "${tunlog}" "${mtlog}"
     fail "line ${LINENO}: unexpected output. Got ${got}, want ${want}"
   fi
 
@@ -90,7 +97,7 @@
   want="HELLO NAME"
 
   if [[ "${got}" != "${want}" ]]; then
-    cat "${vshlog}"
+    dumplogs "${vshlog}" "${tunlog}" "${mtlog}"
     fail "line ${LINENO}: unexpected output. Got ${got}, want ${want}"
   fi