diff --git a/source4/script/tests/mktestdc.sh b/source4/script/tests/mktestdc.sh
index 2068728a49e..da128574798 100755
--- a/source4/script/tests/mktestdc.sh
+++ b/source4/script/tests/mktestdc.sh
@@ -70,7 +70,7 @@ cat >$CONFFILE<<EOF
 [global]
 	iconv:native = $nativeiconv
 	netbios name = $NETBIOSNAME
-        netbios aliases = $SERVER
+	netbios aliases = $SERVER
 	workgroup = $DOMAIN
 	realm = $REALM
 	private dir = $PRIVATEDIR
@@ -80,10 +80,10 @@ cat >$CONFFILE<<EOF
 	share backend = $SHARE_BACKEND
 	setup directory = $SRCDIR/setup
 	js include = $SRCDIR/scripting/libjs
-        winbindd socket directory = $WINBINDD_SOCKET_DIR
+	winbindd socket directory = $WINBINDD_SOCKET_DIR
 	name resolve order = bcast
 	interfaces = 127.0.0.1/8
-        tls dh params file = $DHFILE
+	tls dh params file = $DHFILE
 	panic action = $SRCDIR/script/gdb_backtrace %PID% %PROG%
 	wins support = yes
 	server role = domain controller
@@ -91,14 +91,12 @@ cat >$CONFFILE<<EOF
 	server max protocol = SMB2
 	notify:inotify = false
 	ldb:nosync = true
-	torture:subunitdir = $SRCDIR/bin/torture
 	torture:basedir = $TEST_DATA_PREFIX
 
 	system:anonymous = true
 #We don't want to pass our self-tests if the PAC code is wrong
-        gensec:require_pac = true
-
-        log level = $SMBD_LOGLEVEL
+	gensec:require_pac = true
+	log level = $SMBD_LOGLEVEL
 
 [tmp]
 	path = $TMPDIR
@@ -297,4 +295,4 @@ echo "PREFIX=$PREFIX"
 echo "SMBD_LOGLEVEL=$SMBD_LOGLEVEL"
 echo "LDAPDIR=$LDAPDIR"
 echo "PROVISION_OPTIONS=$PROVISION_OPTIONS"
-echo "PROVISION_ACI=$PROVISION_ACI"
\ No newline at end of file
+echo "PROVISION_ACI=$PROVISION_ACI"
diff --git a/source4/script/tests/selftest.pl b/source4/script/tests/selftest.pl
index d3a7f217aba..86c00ac9460 100755
--- a/source4/script/tests/selftest.pl
+++ b/source4/script/tests/selftest.pl
@@ -313,7 +313,7 @@ Behaviour:
  --one                      abort when the first test fails
  --immediate                print test output for failed tests during run
  --verbose                  be verbose
- --analyse-cmd CMD			command to run after each test
+ --analyse-cmd CMD          command to run after each test
 ";
 	exit(0);
 }
@@ -346,6 +346,7 @@ my $tests = shift;
 # quick hack to disable rpc validation when using valgrind - its way too slow
 unless (defined($ENV{VALGRIND})) {
 	$ENV{VALIDATE} = "validate";
+    $ENV{MALLOC_CHECK_} = 2;
 }
 
 my $old_pwd = "$RealBin/../..";
diff --git a/source4/script/tests/test_binding_string.sh b/source4/script/tests/test_binding_string.sh
index 52bbf66b1f1..95588939819 100755
--- a/source4/script/tests/test_binding_string.sh
+++ b/source4/script/tests/test_binding_string.sh
@@ -16,7 +16,6 @@ shift 4
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
-failed=0;
 for I in "ncacn_np:$server" \
 		 "ncacn_ip_tcp:$server" \
 		 "ncacn_np:$server[rpcecho]"  \
@@ -28,7 +27,5 @@ for I in "ncacn_np:$server" \
 		 "308FB580-1EB2-11CA-923B-08002B1075A7@ncacn_np:$server" \
 		 "308FB580-1EB2-11CA-923B-08002B1075A7@ncacn_ip_tcp:$server" 
 do
-	testit "$I" rpc bin/smbtorture $TORTURE_OPTIONS "$I" -U"$username"%"$password" -W $domain --option=torture:quick=yes RPC-ECHO "$*"
+	plantest "$I" rpc bin/smbtorture $TORTURE_OPTIONS "$I" -U"$username"%"$password" -W $domain --option=torture:quick=yes RPC-ECHO "$*"
 done
-
-testok $0 $failed
diff --git a/source4/script/tests/test_blackbox.sh b/source4/script/tests/test_blackbox.sh
index 86b56c2d1ae..dd6c31c4366 100755
--- a/source4/script/tests/test_blackbox.sh
+++ b/source4/script/tests/test_blackbox.sh
@@ -20,7 +20,5 @@ ADDARGS="$@"
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
-testit "smbclient" smb $incdir/../../../testprogs/blackbox/test_smbclient.sh "$SERVER" "$USERNAME" "$PASSWORD" "$DOMAIN" "$PREFIX" "$ADDARGS"
-testit "cifsdd" smb $incdir/../../../testprogs/blackbox/test_cifsdd.sh "$SERVER" "$USERNAME" "$PASSWORD" "$DOMAIN" "$ADDARGS"
-
-testok $0 $failed
+plantest "blackbox.smbclient" smb $incdir/../../../testprogs/blackbox/test_smbclient.sh "$SERVER" "$USERNAME" "$PASSWORD" "$DOMAIN" "$PREFIX" "$ADDARGS"
+plantest "blackbox.cifsdd" smb $incdir/../../../testprogs/blackbox/test_cifsdd.sh "$SERVER" "$USERNAME" "$PASSWORD" "$DOMAIN" "$ADDARGS"
diff --git a/source4/script/tests/test_echo.sh b/source4/script/tests/test_echo.sh
index f9fc7f3cadb..79a19b1c2e5 100755
--- a/source4/script/tests/test_echo.sh
+++ b/source4/script/tests/test_echo.sh
@@ -24,13 +24,12 @@ if [ $server = "localtest" ]; then
     transports="ncalrpc $transports"
 fi
 
-failed=0
 for transport in $transports; do
  for bindoptions in connect spnego spnego,sign spnego,seal $VALIDATE padcheck bigendian bigendian,seal; do
   for ntlmoptions in \
         "--option=socket:testnonblock=True --option=torture:quick=yes"; do
    name="RPC-ECHO on $transport with $bindoptions and $ntlmoptions"
-   testit "$name" rpc bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" $ntlmoptions -U"$username"%"$password" -W $domain RPC-ECHO "$*"
+   plantest "$name" rpc bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" $ntlmoptions -U"$username"%"$password" -W $domain RPC-ECHO "$*"
   done
  done
 done
@@ -49,12 +48,10 @@ for transport in $transports; do
         "--option=clientntlmv2auth=yes  --option=ntlmssp_client:128bit=no --option=ntlmssp_client:keyexchange=no  --option=torture:quick=yes" \
     ; do
    name="RPC-ECHO on $transport with $bindoptions and $ntlmoptions"
-   testit "$name" rpc bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" $ntlmoptions -U"$username"%"$password" -W $domain RPC-ECHO "$*"
+   plantest "$name" rpc bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" $ntlmoptions -U"$username"%"$password" -W $domain RPC-ECHO "$*"
   done
  done
 done
 
 name="RPC-ECHO on ncacn_np over smb2"
-testit "$name" rpc bin/smbtorture $TORTURE_OPTIONS ncacn_np:"$server[smb2]" -U"$username"%"$password" -W $domain RPC-ECHO "$*"
-
-testok $0 $failed
+plantest "$name" rpc bin/smbtorture $TORTURE_OPTIONS ncacn_np:"$server[smb2]" -U"$username"%"$password" -W $domain RPC-ECHO "$*"
diff --git a/source4/script/tests/test_ejs.sh b/source4/script/tests/test_ejs.sh
index f89c3556b44..4eba2de81a5 100755
--- a/source4/script/tests/test_ejs.sh
+++ b/source4/script/tests/test_ejs.sh
@@ -23,12 +23,10 @@ DATADIR=../testdata
 PATH=bin:$PATH
 export PATH
 
-testit "base.js" rpc "$SCRIPTDIR/base.js" $CONFIGURATION
-testit "samr.js" rpc "$SCRIPTDIR/samr.js" $CONFIGURATION ncalrpc: -U$USERNAME%$PASSWORD
-testit "echo.js" rpc "$SCRIPTDIR/echo.js" $CONFIGURATION ncalrpc: -U$USERNAME%$PASSWORD
-testit "ejsnet.js" rpc "$SCRIPTDIR/ejsnet.js" $CONFIGURATION -U$USERNAME%$PASSWORD $DOMAIN ejstestuser
-testit "ldb.js" none "$SCRIPTDIR/ldb.js" `pwd` $CONFIGURATION
-testit "samba3sam.js" none $SCRIPTDIR/samba3sam.js $CONFIGURATION `pwd` $DATADIR/samba3/
-testit "winreg" rpc scripting/bin/winreg $CONFIGURATION ncalrpc: 'HKLM' -U$USERNAME%$PASSWORD
-
-testok $0 $failed
+plantest "base.js" rpc "$SCRIPTDIR/base.js" $CONFIGURATION
+plantest "samr.js" rpc "$SCRIPTDIR/samr.js" $CONFIGURATION ncalrpc: -U$USERNAME%$PASSWORD
+plantest "echo.js" rpc "$SCRIPTDIR/echo.js" $CONFIGURATION ncalrpc: -U$USERNAME%$PASSWORD
+plantest "ejsnet.js" rpc "$SCRIPTDIR/ejsnet.js" $CONFIGURATION -U$USERNAME%$PASSWORD $DOMAIN ejstestuser
+plantest "ldb.js" none "$SCRIPTDIR/ldb.js" `pwd` $CONFIGURATION
+plantest "samba3sam.js" none $SCRIPTDIR/samba3sam.js $CONFIGURATION `pwd` $DATADIR/samba3/
+plantest "winreg" rpc scripting/bin/winreg $CONFIGURATION ncalrpc: 'HKLM' -U$USERNAME%$PASSWORD
diff --git a/source4/script/tests/test_functions.sh b/source4/script/tests/test_functions.sh
index 801d6dc05b3..6a7f8aba988 100755
--- a/source4/script/tests/test_functions.sh
+++ b/source4/script/tests/test_functions.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-testit() {
+plantest() {
 	name=$1
 	env=$2
 	shift 2
@@ -10,39 +10,3 @@ testit() {
 	echo $env
 	echo $cmdline
 }
-
-testok() {
-	name=`basename $1`
-	failed=$2
-
-	if [ x"$failed" = x"0" ];then
-		:
-	else
-		echo "$failed TESTS FAILED or SKIPPED ($name)";
-	fi
-	exit $failed
-}
-
-teststatus() {
-	name=`basename $1`
-	failed=$2
-
-	echo "TEST STATUS: $failed failures";
-	test x"$failed" = x"0" || {
-cat <<EOF	    
-************************
-*** TESTSUITE FAILED ***
-************************
-EOF
-	}
-	exit $failed
-}
-
-if [ -z "$VALGRIND" ]; then
-    MALLOC_CHECK_=2
-    export MALLOC_CHECK_
-fi
-
-# initialise the local failed variable to zero when starting each of the tests
-failed=0
-
diff --git a/source4/script/tests/test_ldap.sh b/source4/script/tests/test_ldap.sh
index 7399c6463c4..8d85e5a8e59 100755
--- a/source4/script/tests/test_ldap.sh
+++ b/source4/script/tests/test_ldap.sh
@@ -17,18 +17,18 @@ incdir=`dirname $0`
 
 p=ldap
 for options in "" "--option=socket:testnonblock=true" "-U$USERNAME%$PASSWORD --option=socket:testnonblock=true" "-U$USERNAME%$PASSWORD"; do
-    testit "TESTING PROTOCOL $p with options $options" ldap ../testprogs/blackbox/test_ldb.sh $p $SERVER $options
+    plantest "TESTING PROTOCOL $p with options $options" ldap ../testprogs/blackbox/test_ldb.sh $p $SERVER $options
 done
 # see if we support ldaps
 if grep ENABLE_GNUTLS.1 include/config.h > /dev/null; then
     p=ldaps
     for options in "" "-U$USERNAME%$PASSWORD"; do
-	testit "TESTING PROTOCOL $p with options $options" ldap ../testprogs/blackbox/test_ldb.sh $p $SERVER $options
+	plantest "TESTING PROTOCOL $p with options $options" ldap ../testprogs/blackbox/test_ldb.sh $p $SERVER $options
     done
 fi
 for t in LDAP-CLDAP LDAP-BASIC LDAP-SCHEMA LDAP-UPTODATENESS
 do
-	testit "$t" ldap bin/smbtorture $TORTURE_OPTIONS "-U$USERNAME%$PASSWORD" //$SERVER/_none_ $t
+	plantest "$t" ldap bin/smbtorture $TORTURE_OPTIONS "-U$USERNAME%$PASSWORD" //$SERVER/_none_ $t
 done
 
 # only do the ldb tests when not in quick mode - they are quite slow, and ldb
@@ -36,11 +36,9 @@ done
 test "$TORTURE_QUICK" = "yes" || {
    LDBDIR=lib/ldb
    export LDBDIR
-   testit "ldb" ldap $LDBDIR/tests/test-tdb.sh
+   plantest "ldb" ldap $LDBDIR/tests/test-tdb.sh
 }
 
 SCRIPTDIR=../testprogs/ejs
 
-testit "ejs ldap" ldap $SCRIPTDIR/ldap.js $CONFIGURATION $SERVER -U$USERNAME%$PASSWORD
-
-testok $0 $failed
+plantest "ejs ldap" ldap $SCRIPTDIR/ldap.js $CONFIGURATION $SERVER -U$USERNAME%$PASSWORD
diff --git a/source4/script/tests/test_local.sh b/source4/script/tests/test_local.sh
index e3ff3c80a66..57e11961bb8 100755
--- a/source4/script/tests/test_local.sh
+++ b/source4/script/tests/test_local.sh
@@ -22,11 +22,8 @@ incdir=`dirname $0`
 SMBD_TEST_FIFO=""
 export SMBD_TEST_FIFO
 
-failed=0
 for t in $local_tests; do
-	testit "$t" none $VALGRIND bin/smbtorture $TORTURE_OPTIONS ncalrpc: $t "$*"
+	plantest "$t" none $VALGRIND bin/smbtorture $TORTURE_OPTIONS ncalrpc: $t "$*"
 done
 
-testit "tdb stress" none $VALGRIND bin/tdbtorture
-
-testok $0 $failed
+plantest "tdb stress" none $VALGRIND bin/tdbtorture
diff --git a/source4/script/tests/test_nbt.sh b/source4/script/tests/test_nbt.sh
index a04feea0798..c3a09d4fb10 100755
--- a/source4/script/tests/test_nbt.sh
+++ b/source4/script/tests/test_nbt.sh
@@ -20,13 +20,11 @@ SCRIPTDIR=../testprogs/ejs
 PATH=bin:$PATH
 export PATH
 
-testit "nmblookup -U $SERVER $SERVER" netbios bin/nmblookup $TORTURE_OPTIONS -U $SERVER $SERVER
-testit "nmblookup $SERVER" netbios bin/nmblookup $TORTURE_OPTIONS $SERVER
+plantest "nmblookup -U $SERVER $SERVER" netbios bin/nmblookup $TORTURE_OPTIONS -U $SERVER $SERVER
+plantest "nmblookup $SERVER" netbios bin/nmblookup $TORTURE_OPTIONS $SERVER
 
 NBT_TESTS=`bin/smbtorture --list | grep ^NBT`
 
 for f in $NBT_TESTS; do
-    testit "$f" netbios bin/smbtorture $TORTURE_OPTIONS //$SERVER/_none_ $f -U$USERNAME%$PASSWORD 
+    plantest "$f" netbios bin/smbtorture $TORTURE_OPTIONS //$SERVER/_none_ $f -U$USERNAME%$PASSWORD 
 done
-
-testok $0 $failed
diff --git a/source4/script/tests/test_net.sh b/source4/script/tests/test_net.sh
index 05b42130ab1..b7b12c8b7ab 100755
--- a/source4/script/tests/test_net.sh
+++ b/source4/script/tests/test_net.sh
@@ -22,7 +22,6 @@ shift 4
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
-failed=0
 for bindoptions in seal,padcheck $VALIDATE bigendian; do
  for transport in ncalrpc ncacn_np ncacn_ip_tcp; do
      case $transport in
@@ -32,9 +31,7 @@ for bindoptions in seal,padcheck $VALIDATE bigendian; do
      esac
    for t in $tests; do
     name="$t on $transport with $bindoptions"
-    testit "$name" rpc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*"
+    plantest "$name" rpc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*"
    done
  done
 done
-
-testok $0 $failed
diff --git a/source4/script/tests/test_pidl.sh b/source4/script/tests/test_pidl.sh
index 2271b7b4d87..d143cd6b0a0 100755
--- a/source4/script/tests/test_pidl.sh
+++ b/source4/script/tests/test_pidl.sh
@@ -7,14 +7,10 @@ fi
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
-failed=0
-
 if $PERL -e 'eval require Test::More;' > /dev/null 2>&1; then
   for f in pidl/tests/*.pl; do
-     testit "$f" none $PERL $f
+     plantest "$f" none $PERL $f
   done
 else 
    echo "Skipping pidl tests - Test::More not installed"
 fi
-
-testok $0 $failed
diff --git a/source4/script/tests/test_posix.sh b/source4/script/tests/test_posix.sh
index 9fdfa981471..8faaac1a88e 100755
--- a/source4/script/tests/test_posix.sh
+++ b/source4/script/tests/test_posix.sh
@@ -30,5 +30,5 @@ for t in $tests; do
 	continue;
     fi
     start=""
-    testit "$t" smb $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t
+    plantest "$t" smb $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t
 done
diff --git a/source4/script/tests/test_quick.sh b/source4/script/tests/test_quick.sh
index 14d7e0865b1..19dfab5730c 100755
--- a/source4/script/tests/test_quick.sh
+++ b/source4/script/tests/test_quick.sh
@@ -25,15 +25,11 @@ tests="$tests RAW-MKDIR RAW-SEEK RAW-OPEN RAW-WRITE"
 tests="$tests RAW-UNLINK RAW-READ RAW-CLOSE RAW-IOCTL RAW-RENAME"
 tests="$tests RAW-EAS RAW-STREAMS"
 
-failed=0
 for t in $tests; do
     if [ ! -z "$start" -a "$start" != $t ]; then
 	continue;
     fi
     start=""
     name="$t"
-    testit "$name" base $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t
+    plantest "$name" base $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t
 done
-
-testok $0 $failed
-
diff --git a/source4/script/tests/test_rpc.sh b/source4/script/tests/test_rpc.sh
index 21a238b7b30..3ee7fa9f352 100755
--- a/source4/script/tests/test_rpc.sh
+++ b/source4/script/tests/test_rpc.sh
@@ -25,7 +25,6 @@ shift 4
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
-failed=0
 for bindoptions in seal,padcheck $VALIDATE bigendian; do
  for transport in ncalrpc ncacn_np ncacn_ip_tcp; do
      case $transport in
@@ -35,7 +34,7 @@ for bindoptions in seal,padcheck $VALIDATE bigendian; do
      esac
    for t in $tests; do
     name="$t on $transport with $bindoptions"
-    testit "$name" rpc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*"
+    plantest "$name" rpc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*"
    done
  done
 done
@@ -49,10 +48,7 @@ for bindoptions in connect $VALIDATE ; do
      esac
    for t in $tests; do
     name="$t on $transport with $bindoptions"
-    testit "$name" rpc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*"
+    plantest "$name" rpc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*"
    done
  done
 done
-
-testok $0 $failed
-
diff --git a/source4/script/tests/test_rpc_quick.sh b/source4/script/tests/test_rpc_quick.sh
index e01c6d1d102..3526c53c3b4 100755
--- a/source4/script/tests/test_rpc_quick.sh
+++ b/source4/script/tests/test_rpc_quick.sh
@@ -22,7 +22,6 @@ shift 4
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
-failed=0
 for bindoptions in seal,padcheck $VALIDATE bigendian; do
  for transport in ncalrpc ncacn_np ncacn_ip_tcp; do
    case $transport in
@@ -32,9 +31,7 @@ for bindoptions in seal,padcheck $VALIDATE bigendian; do
    esac
    for t in $tests; do
     name="$t on $transport with $bindoptions"
-    testit "$name" rpc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*"
+    plantest "$name" rpc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*"
    done
  done
 done
-
-testok $0 $failed
diff --git a/source4/script/tests/test_s3upgrade.sh b/source4/script/tests/test_s3upgrade.sh
index 30b7ee06e4b..df7ae43c2aa 100755
--- a/source4/script/tests/test_s3upgrade.sh
+++ b/source4/script/tests/test_s3upgrade.sh
@@ -18,5 +18,5 @@ rm -f $PREFIX/*
 
 . script/tests/test_functions.sh
 
-testit "parse samba3" none bin/smbscript ../testdata/samba3/verify $CONFIGURATION ../testdata/samba3
-#testit "upgrade" none bin/smbscript setup/upgrade $CONFIGURATION --verify --targetdir=$PREFIX ../testdata/samba3 ../testdata/samba3/smb.conf
+plantest "parse samba3" none bin/smbscript ../testdata/samba3/verify $CONFIGURATION ../testdata/samba3
+#plantest "upgrade" none bin/smbscript setup/upgrade $CONFIGURATION --verify --targetdir=$PREFIX ../testdata/samba3 ../testdata/samba3/smb.conf
diff --git a/source4/script/tests/test_session_key.sh b/source4/script/tests/test_session_key.sh
index ca568c3516e..e9ce143eaaf 100755
--- a/source4/script/tests/test_session_key.sh
+++ b/source4/script/tests/test_session_key.sh
@@ -17,7 +17,6 @@ shift 5
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
-failed=0
 transport="ncacn_np"
 for bindoptions in bigendian seal; do
  for keyexchange in "yes" "no"; do
@@ -37,18 +36,17 @@ for bindoptions in bigendian seal; do
         "-k no --option=gensec:spnego=no --option=clientntlmv2auth=yes" \
         "-k no --option=usespnego=no"; do
    name="RPC-SECRETS on $transport with $bindoptions with NTLM2:$ntlm2 KEYEX:$keyexchange LM_KEY:$lm_key $ntlmoptions"
-   testit "$name" rpc bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" --option=ntlmssp_client:keyexchange=$keyexchange --option=ntlmssp_client:ntlm2=$ntlm2 --option=ntlmssp_client:lm_key=$lm_key $ntlmoptions -U"$username"%"$password" -W $domain --option=gensec:target_hostname=$netbios_name RPC-SECRETS "$*"
+   plantest "$name" rpc bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" --option=ntlmssp_client:keyexchange=$keyexchange --option=ntlmssp_client:ntlm2=$ntlm2 --option=ntlmssp_client:lm_key=$lm_key $ntlmoptions -U"$username"%"$password" -W $domain --option=gensec:target_hostname=$netbios_name RPC-SECRETS "$*"
   done
  done
  done
  done
  name="RPC-SECRETS on $transport with $bindoptions with Kerberos"
- testit "$name" rpc bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -k yes -U"$username"%"$password" -W $domain "--option=gensec:target_hostname=$netbios_name" RPC-SECRETS "$*"
+ plantest "$name" rpc bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -k yes -U"$username"%"$password" -W $domain "--option=gensec:target_hostname=$netbios_name" RPC-SECRETS "$*"
  name="RPC-SECRETS on $transport with $bindoptions with Kerberos - use target principal"
- testit "$name" rpc bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -k yes -U"$username"%"$password" -W $domain "--option=clientusespnegoprincipal=yes" "--option=gensec:target_hostname=$netbios_name" RPC-SECRETS "$*"
+ plantest "$name" rpc bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -k yes -U"$username"%"$password" -W $domain "--option=clientusespnegoprincipal=yes" "--option=gensec:target_hostname=$netbios_name" RPC-SECRETS "$*"
 done
 name="RPC-SECRETS on $transport with Kerberos - use Samba3 style login"
- testit "$name" rpc bin/smbtorture $TORTURE_OPTIONS $transport:"$server" -k yes -U"$username"%"$password" -W $domain "--option=gensec:fake_gssapi_krb5=yes" "--option=gensec:gssapi_krb5=no" "--option=gensec:target_hostname=$netbios_name" RPC-SECRETS "$*"
+ plantest "$name" rpc bin/smbtorture $TORTURE_OPTIONS $transport:"$server" -k yes -U"$username"%"$password" -W $domain "--option=gensec:fake_gssapi_krb5=yes" "--option=gensec:gssapi_krb5=no" "--option=gensec:target_hostname=$netbios_name" RPC-SECRETS "$*"
 name="RPC-SECRETS on $transport with Kerberos - use Samba3 style login, use target principal"
- testit "$name" rpc bin/smbtorture $TORTURE_OPTIONS $transport:"$server" -k yes -U"$username"%"$password" -W $domain "--option=clientusespnegoprincipal=yes" "--option=gensec:fake_gssapi_krb5=yes" "--option=gensec:gssapi_krb5=no" "--option=gensec:target_hostname=$netbios_name" RPC-SECRETS "$*"
-testok $0 $failed
+ plantest "$name" rpc bin/smbtorture $TORTURE_OPTIONS $transport:"$server" -k yes -U"$username"%"$password" -W $domain "--option=clientusespnegoprincipal=yes" "--option=gensec:fake_gssapi_krb5=yes" "--option=gensec:gssapi_krb5=no" "--option=gensec:target_hostname=$netbios_name" RPC-SECRETS "$*"
diff --git a/source4/script/tests/test_simple.sh b/source4/script/tests/test_simple.sh
index cec4f7f4c9d..56db719001f 100755
--- a/source4/script/tests/test_simple.sh
+++ b/source4/script/tests/test_simple.sh
@@ -20,15 +20,11 @@ incdir=`dirname $0`
 
 tests="BASE-RW1"
 
-failed=0
 for t in $tests; do
     if [ ! -z "$start" -a "$start" != $t ]; then
 	continue;
     fi
     start=""
     name="$t"
-    testit "$name" smb $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t
+    plantest "$name" smb $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t
 done
-
-testok $0 $failed
-
diff --git a/source4/script/tests/test_swig.sh b/source4/script/tests/test_swig.sh
index c98caeb43ee..9f5e7c0ebf0 100755
--- a/source4/script/tests/test_swig.sh
+++ b/source4/script/tests/test_swig.sh
@@ -10,8 +10,6 @@ fi
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
-failed=0
-
 export PYTHONPATH=lib/tdb/swig:lib/ldb/swig:scripting/swig:$PYTHONPATH
 export LD_LIBRARY_PATH=bin:$LD_LIBRARY_PATH
 
@@ -20,5 +18,3 @@ scripting/swig/torture/torture_tdb.py
 
 echo Testing ldb wrappers
 scripting/swig/torture/torture_ldb.py
-
-testok $0 $failed
diff --git a/source4/script/tests/test_w2k3.sh b/source4/script/tests/test_w2k3.sh
index 122e3ea7a74..b262029892f 100755
--- a/source4/script/tests/test_w2k3.sh
+++ b/source4/script/tests/test_w2k3.sh
@@ -26,8 +26,6 @@ incdir=`dirname $0`
 
 OPTIONS="-U$username%$password -W $domain --option realm=$realm"
 
-failed=0
-
 name="RPC-SPOOLSS on ncacn_np"
 testit "$name" rpc bin/smbtorture $TORTURE_OPTIONS ncacn_np:"$server" $OPTIONS RPC-SPOOLSS "$*"
 
@@ -48,5 +46,3 @@ name="RPC-DRSUAPI on ncacn_ip_tcp with seal"
 testit "$name" rpc bin/smbtorture $TORTURE_OPTIONS ncacn_ip_tcp:"$server[seal]" $OPTIONS RPC-DRSUAPI "$*"
 name="RPC-DRSUAPI on ncacn_ip_tcp with seal,bigendian"
 testit "$name" rpc bin/smbtorture $TORTURE_OPTIONS ncacn_ip_tcp:"$server[seal,bigendian]" $OPTIONS RPC-DRSUAPI "$*"
-
-testok $0 $failed
diff --git a/source4/script/tests/test_w2k3_file.sh b/source4/script/tests/test_w2k3_file.sh
index e39d9b86329..f008d491283 100755
--- a/source4/script/tests/test_w2k3_file.sh
+++ b/source4/script/tests/test_w2k3_file.sh
@@ -39,7 +39,6 @@ fail="RAW-SEARCH RAW-ACLS RAW-QFSINFO"
 
 echo "Skipping tests expected to fail: $fail"
 
-failed=0
 for t in $tests; do
     if [ ! -z "$start" -a "$start" != $t ]; then
 	continue;
@@ -48,5 +47,3 @@ for t in $tests; do
     name="$t"
     testit "$name" smb $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t
 done
-
-testok $0 $failed
diff --git a/source4/script/tests/tests_win.sh b/source4/script/tests/tests_win.sh
index b885056ace9..e25c29d4c9b 100755
--- a/source4/script/tests/tests_win.sh
+++ b/source4/script/tests/tests_win.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
  if [ `whoami` != "root" ]; then
-       echo "Windows tests will not run without root privilages."
+       echo "Windows tests will not run without root privileges."
        exit 1
  fi