diff --git a/tests/instances.tcl b/tests/instances.tcl
index b9eb42258..4e2f33dfc 100644
--- a/tests/instances.tcl
+++ b/tests/instances.tcl
@@ -68,7 +68,7 @@ proc spawn_instance {type base_port count {conf {}}} {
         }
 
         if {$::valgrind} {
-            set pid [exec valgrind --suppressions=../../../src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full ../../../src/${prgname} $cfgfile &]
+            set pid [exec valgrind --track-origins=yes --suppressions=../../../src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full ../../../src/${prgname} $cfgfile &]
         } else {
             set pid [exec ../../../src/${prgname} $cfgfile &]
         }
@@ -401,7 +401,7 @@ proc restart_instance {type id} {
     }
 
     if {$::valgrind} {
-        set pid [exec valgrind --suppressions=../../../src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full ../../../src/${prgname} $cfgfile &]
+        set pid [exec valgrind --track-origins=yes --suppressions=../../../src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full ../../../src/${prgname} $cfgfile &]
     } else {
         set pid [exec ../../../src/${prgname} $cfgfile &]
     }
diff --git a/tests/support/server.tcl b/tests/support/server.tcl
index 67ee24528..317b40a84 100644
--- a/tests/support/server.tcl
+++ b/tests/support/server.tcl
@@ -207,7 +207,7 @@ proc start_server {options {code undefined}} {
     set stderr [format "%s/%s" [dict get $config "dir"] "stderr"]
 
     if {$::valgrind} {
-        set pid [exec valgrind --suppressions=src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full src/redis-server $config_file > $stdout 2> $stderr &]
+        set pid [exec valgrind --track-origins=yes --suppressions=src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full src/redis-server $config_file > $stdout 2> $stderr &]
     } else {
         set pid [exec src/redis-server $config_file > $stdout 2> $stderr &]
     }