3 files changed, 14 insertions, 2 deletions
diff --git a/source4/script/tests/test_posix.sh b/source4/script/tests/test_posix.sh
index da7fceee43..57dae705cd 100755
--- a/source4/script/tests/test_posix.sh
+++ b/source4/script/tests/test_posix.sh
@@ -10,6 +10,10 @@ EOF
 exit 1;
 fi
 
+if [ -z "$VALGRIND" ]; then
+    export MALLOC_CHECK_=2
+fi
+
 unc="$1"
 username="$2"
 password="$3"
diff --git a/source4/script/tests/test_rpc.sh b/source4/script/tests/test_rpc.sh
index 9e11a3d69a..83f7929614 100755
--- a/source4/script/tests/test_rpc.sh
+++ b/source4/script/tests/test_rpc.sh
@@ -13,6 +13,10 @@ EOF
 exit 1;
 fi
 
+if [ -z "$VALGRIND" ]; then
+    export MALLOC_CHECK_=2
+fi
+
 server="$1"
 username="$2"
 password="$3"
@@ -40,7 +44,7 @@ for transport in ncalrpc ncacn_np ncacn_ip_tcp; do
      esac
    for t in $tests; do
     echo Testing $t on $transport with $bindoptions
-    testit bin/smbtorture $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*"
+    testit $VALGRIND bin/smbtorture $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*"
    done
  done
 done
diff --git a/source4/script/tests/test_w2k3.sh b/source4/script/tests/test_w2k3.sh
index a05bfb28b0..fb94c043d4 100755
--- a/source4/script/tests/test_w2k3.sh
+++ b/source4/script/tests/test_w2k3.sh
@@ -14,6 +14,10 @@ EOF
 exit 1;
 fi
 
+if [ -z "$VALGRIND" ]; then
+    export MALLOC_CHECK_=2
+fi
+
 server="$1"
 username="$2"
 password="$3"
@@ -23,7 +27,7 @@ shift 4
 testit() {
    trap "rm -f test.$$" EXIT
    cmdline="$*"
-   if ! $cmdline > test.$$ 2>&1; then
+   if ! $VALGRIND $cmdline > test.$$ 2>&1; then
        cat test.$$;
        rm -f test.$$;
        echo "TEST FAILED - $cmdline";