diff --git a/tests/integration/aof.tcl b/tests/integration/aof.tcl
index 3c77cb9664d19c3d140ef88c7f33c9e1dc4dc387..a554f9ef13573d16fb4dd6e480510d7f30ac53c0 100644
--- a/tests/integration/aof.tcl
+++ b/tests/integration/aof.tcl
@@ -32,6 +32,7 @@ tags {"aof"} {
 
     start_server_aof [list dir $server_path] {
         test "Unfinished MULTI: Server should not have been started" {
+            if {$::valgrind} {after 2000}
             assert_equal 0 [is_alive $srv]
         }
 
@@ -49,6 +50,7 @@ tags {"aof"} {
 
     start_server_aof [list dir $server_path] {
         test "Short read: Server should not have been started" {
+            if {$::valgrind} {after 2000}
             assert_equal 0 [is_alive $srv]
         }
 
diff --git a/tests/integration/replication.tcl b/tests/integration/replication.tcl
index 4756b82c83fab4b78fbfc539bd2ff6401d2b66e6..0a1cd409fed067ae6a7e5c6b3bb61732b7f9feee 100644
--- a/tests/integration/replication.tcl
+++ b/tests/integration/replication.tcl
@@ -54,6 +54,7 @@ start_server {tags {"repl"}} {
         
         test {SET on the master should immediately propagate} {
             r -1 set mykey bar
+            if {$::valgrind} {after 2000}
             r  0 get mykey
         } {bar}
     }
diff --git a/tests/support/server.tcl b/tests/support/server.tcl
index fb8c43d0416502df44250dec03d7e4e654bbda93..3fa1725f3cc2371431b8878923cb9dc114cf6388 100644
--- a/tests/support/server.tcl
+++ b/tests/support/server.tcl
@@ -19,10 +19,7 @@ proc check_valgrind_errors stderr {
     if {![regexp -- {ERROR SUMMARY: 0 errors} $buf] ||
         (![regexp -- {definitely lost: 0 bytes} $buf] &&
          ![regexp -- {no leaks are possible} $buf])} {
-        puts "*** VALGRIND ERRORS ***"
-        puts $buf
-        puts "-----------------------"
-        append ::valgrind_errors "$buf\n\n"
+        send_data_packet $::test_server_fd err "Valgrind error: $buf\n"
     }
 }