diff --git a/ctdb/tests/tool/scripts/local.sh b/ctdb/tests/tool/scripts/local.sh
index 1ac8a9a912d..3ed4054ad8b 100644
--- a/ctdb/tests/tool/scripts/local.sh
+++ b/ctdb/tests/tool/scripts/local.sh
@@ -19,7 +19,7 @@ define_test ()
 	ctdb.*)
 	    _cmd="${_f#ctdb.}"
 	    _cmd="${_cmd%.*}" # Strip test number
-	    export CTDB="ctdb --socket $ctdbd_socket"
+	    export CTDB="$VALGRIND ctdb --socket $ctdbd_socket"
 	    export CTDB_DEBUGLEVEL=3
 	    test_args="$_cmd"
 	    ;;
@@ -46,7 +46,7 @@ setup_ctdbd ()
 {
 	debug "Setting up fake ctdbd"
 
-	fake_ctdbd -s "$ctdbd_socket" -p "$ctdbd_pidfile"
+	$VALGRIND fake_ctdbd -s "$ctdbd_socket" -p "$ctdbd_pidfile"
 	test_cleanup cleanup_ctdbd
 }