5 files changed, 6 insertions, 16 deletions
diff --git a/source4/script/tests/test_functions.sh b/source4/script/tests/test_functions.sh
index d435f2b8a8..2ddf1edb8f 100644
--- a/source4/script/tests/test_functions.sh
+++ b/source4/script/tests/test_functions.sh
@@ -164,3 +164,9 @@ teststatus() {
 	fi
 	exit $failed
 }
+
+if [ -z "$VALGRIND" ]; then
+    MALLOC_CHECK_=2
+    export MALLOC_CHECK_
+fi
+
diff --git a/source4/script/tests/test_local.sh b/source4/script/tests/test_local.sh
index b50ec58e0b..bd85e8a9de 100755
--- a/source4/script/tests/test_local.sh
+++ b/source4/script/tests/test_local.sh
@@ -9,10 +9,6 @@ EOF
 exit 1;
 fi
 
-if [ -z "$VALGRIND" ]; then
-    export MALLOC_CHECK_=2
-fi
-
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
diff --git a/source4/script/tests/test_posix.sh b/source4/script/tests/test_posix.sh
index 68fb59350e..b1ab8feb98 100755
--- a/source4/script/tests/test_posix.sh
+++ b/source4/script/tests/test_posix.sh
@@ -10,10 +10,6 @@ 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 e2cf7c8c03..e5fc726a4b 100755
--- a/source4/script/tests/test_rpc.sh
+++ b/source4/script/tests/test_rpc.sh
@@ -16,10 +16,6 @@ EOF
 exit 1;
 fi
 
-if [ -z "$VALGRIND" ]; then
-    export MALLOC_CHECK_=2
-fi
-
 server="$1"
 username="$2"
 password="$3"
diff --git a/source4/script/tests/test_w2k3.sh b/source4/script/tests/test_w2k3.sh
index 71c6f3a4f7..3e7da590c0 100755
--- a/source4/script/tests/test_w2k3.sh
+++ b/source4/script/tests/test_w2k3.sh
@@ -14,10 +14,6 @@ EOF
 exit 1;
 fi
 
-if [ -z "$VALGRIND" ]; then
-    export MALLOC_CHECK_=2
-fi
-
 server="$1"
 username="$2"
 password="$3"