diff --git a/tests/support/test.tcl b/tests/support/test.tcl
index b7cd38b38..d85f31e0b 100644
--- a/tests/support/test.tcl
+++ b/tests/support/test.tcl
@@ -217,6 +217,7 @@ proc test {name code {okpattern undefined} {tags {}}} {
 
     send_data_packet $::test_server_fd testing $name
 
+    set failed false
     set test_start_time [clock milliseconds]
     if {[catch {set retval [uplevel 1 $code]} error]} {
         set assertion [string match "assertion:*" $error]
@@ -231,6 +232,7 @@ proc test {name code {okpattern undefined} {tags {}}} {
             lappend ::tests_failed $details
 
             incr ::num_failed
+            set failed true
             send_data_packet $::test_server_fd err [join $details "\n"]
 
             if {$::stop_on_failure} {
@@ -253,10 +255,17 @@ proc test {name code {okpattern undefined} {tags {}}} {
             lappend ::tests_failed $details
 
             incr ::num_failed
+            set failed true
             send_data_packet $::test_server_fd err [join $details "\n"]
         }
     }
 
+    if {$::dump_logs && $failed} {
+        foreach srv $::servers {
+            dump_server_log $srv
+        }
+    }
+
     if {$::traceleaks} {
         set output [exec leaks redis-server]
         if {![string match {*0 leaks*} $output]} {