diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index 33bea13d1f..ef1611fb80 100644
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -15,7 +15,7 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
-# $Id: tests.sh,v 1.15 2000/06/22 21:51:36 tale Exp $
+# $Id: tests.sh,v 1.16 2000/07/05 18:48:57 bwelling Exp $
 
 #
 # Perform tests
@@ -88,9 +88,5 @@ $DIG +tcp +noadd +nosea +nostat +noquest +nocmd -p 5300 \
     example. key @10.53.0.5 -p 5300 > dig.out.ns5 || status=1
 grep "SERVFAIL" dig.out.ns5 > /dev/null || status=1
 
-if [ $status != 0 ]; then
-	echo "R:FAIL"
-else
-	echo "R:PASS"
-fi
-
+echo "I: exit status: $status"
+exit $status
diff --git a/bin/tests/system/limits/tests.sh b/bin/tests/system/limits/tests.sh
index bc132fe034..27dd38ff67 100644
--- a/bin/tests/system/limits/tests.sh
+++ b/bin/tests/system/limits/tests.sh
@@ -15,7 +15,7 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
-# $Id: tests.sh,v 1.3 2000/06/28 19:01:38 gson Exp $
+# $Id: tests.sh,v 1.4 2000/07/05 18:48:59 bwelling Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
@@ -69,8 +69,5 @@ status=`expr $status + $?`
 grep 'flags: qr aa tc ad;' dig.out.ns1
 status=`expr $status + $?`
 
-if [ $status != 0 ]; then
-	echo "R:FAIL"
-else
-	echo "R:PASS"
-fi
+echo "I: exit status: $status"
+exit $status
diff --git a/bin/tests/system/lwresd/tests.sh b/bin/tests/system/lwresd/tests.sh
index 394e65783b..16b0dbe7d5 100644
--- a/bin/tests/system/lwresd/tests.sh
+++ b/bin/tests/system/lwresd/tests.sh
@@ -15,7 +15,7 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
-# $Id: tests.sh,v 1.2 2000/06/22 21:52:07 tale Exp $
+# $Id: tests.sh,v 1.3 2000/07/05 18:49:00 bwelling Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
@@ -30,9 +30,5 @@ status=0;
 ./lwtest
 status=`expr $status + $?`
 
-
-if [ $status != 0 ]; then
-	echo "R:FAIL"
-else
-	echo "R:PASS"
-fi
+echo "I: exit status: $status"
+exit $status
diff --git a/bin/tests/system/notify/tests.sh b/bin/tests/system/notify/tests.sh
index cbce04f648..7c32d4c902 100644
--- a/bin/tests/system/notify/tests.sh
+++ b/bin/tests/system/notify/tests.sh
@@ -15,7 +15,7 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
-# $Id: tests.sh,v 1.17 2000/07/05 18:16:39 bwelling Exp $
+# $Id: tests.sh,v 1.18 2000/07/05 18:49:01 bwelling Exp $
 
 #
 # Perform tests
@@ -112,8 +112,5 @@ grep ";" dig.out.ns3
 $PERL ../digcomp.pl dig.out.ns2 dig.out.ns3
 status=`expr $status + $?`
 
-if [ $status != 0 ]; then
-	echo "R:FAIL"
-else
-	echo "R:PASS"
-fi
+echo "I: exit status: $status"
+exit $status
diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index 937b010691..3e02164a55 100644
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -15,7 +15,7 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
-# $Id: run.sh,v 1.26 2000/06/22 21:51:27 tale Exp $
+# $Id: run.sh,v 1.27 2000/07/05 18:48:55 bwelling Exp $
 
 #
 # Run a system test.
@@ -92,6 +92,14 @@ fi
 # Shutdown
 sh stop.sh $test
 
+status=`expr $status + $?`
+
+if [ $status != 0 ]; then
+	echo "R:FAIL"
+else
+	echo "R:PASS"
+fi
+
 # Cleanup
 if test -f $test/clean.sh
 then
diff --git a/bin/tests/system/stop.sh b/bin/tests/system/stop.sh
index b19d7503cc..63c72a3097 100644
--- a/bin/tests/system/stop.sh
+++ b/bin/tests/system/stop.sh
@@ -15,7 +15,7 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
-# $Id: stop.sh,v 1.8 2000/06/22 21:51:30 tale Exp $
+# $Id: stop.sh,v 1.9 2000/07/05 18:48:56 bwelling Exp $
 
 #
 # Stop name servers.
@@ -23,6 +23,8 @@
 
 test $# -gt 0 || { echo "usage: $0 test-directory" >&2; exit 1; }
 
+status=0
+
 cd $1
 
 for d in ns*
@@ -47,6 +49,7 @@ for d in ns*
 do
      pidfile="$d/named.pid"
      if [ -f $pidfile ]; then
+	status=`expr $status + 1`
         kill -KILL `cat $pidfile`
      fi
 done
@@ -55,9 +58,9 @@ for d in lwresd*
 do
      pidfile="$d/lwresd.pid"
      if [ -f $pidfile ]; then
+	status=`expr $status + 1`
         kill -KILL `cat $pidfile`
      fi
 done
 
-sleep 10
-
+exit $status
diff --git a/bin/tests/system/stub/tests.sh b/bin/tests/system/stub/tests.sh
index e62cc8a703..34670e2f32 100644
--- a/bin/tests/system/stub/tests.sh
+++ b/bin/tests/system/stub/tests.sh
@@ -15,7 +15,7 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
-# $Id: tests.sh,v 1.3 2000/06/22 21:52:33 tale Exp $
+# $Id: tests.sh,v 1.4 2000/07/05 18:49:02 bwelling Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
@@ -45,8 +45,5 @@ status=`expr $status + $?`
 $PERL ../digcomp.pl knowngood.dig.out.rec dig.out.ns3
 status=`expr $status + $?`
 
-if [ $status != 0 ]; then
-	echo "R:FAIL"
-else
-	echo "R:PASS"
-fi
+echo "I: exit status: $status"
+exit $status
diff --git a/bin/tests/system/views/tests.sh b/bin/tests/system/views/tests.sh
index 87ef44fb13..c76fe07113 100644
--- a/bin/tests/system/views/tests.sh
+++ b/bin/tests/system/views/tests.sh
@@ -15,7 +15,7 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
-# $Id: tests.sh,v 1.12 2000/06/22 21:52:45 tale Exp $
+# $Id: tests.sh,v 1.13 2000/07/05 18:49:04 bwelling Exp $
 
 #
 # Perform tests
@@ -75,8 +75,5 @@ if [ $? = 0 ]; then
 	status=`expr $status + 1`
 fi
 
-if [ $status != 0 ]; then
-	echo "R:FAIL"
-else
-	echo "R:PASS"
-fi
+echo "I: exit status: $status"
+exit $status
diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh
index cfdc280418..e6a7f935b3 100644
--- a/bin/tests/system/xfer/tests.sh
+++ b/bin/tests/system/xfer/tests.sh
@@ -15,7 +15,7 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
-# $Id: tests.sh,v 1.15 2000/06/22 21:53:01 tale Exp $
+# $Id: tests.sh,v 1.16 2000/07/05 18:49:05 bwelling Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
@@ -58,8 +58,5 @@ grep ";" dig.out.ns3
 $PERL ../digcomp.pl dig.out.ns2 dig.out.ns3
 status=`expr $status + $?`
 
-if [ $status != 0 ]; then
-	echo "R:FAIL"
-else
-	echo "R:PASS"
-fi
+echo "I: exit status: $status"
+exit $status
diff --git a/bin/tests/system/xferquota/tests.sh b/bin/tests/system/xferquota/tests.sh
index b4e2e3d7c7..d22001327d 100644
--- a/bin/tests/system/xferquota/tests.sh
+++ b/bin/tests/system/xferquota/tests.sh
@@ -15,7 +15,7 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
-# $Id: tests.sh,v 1.11 2000/06/22 21:53:15 tale Exp $
+# $Id: tests.sh,v 1.12 2000/07/05 18:49:06 bwelling Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
@@ -73,8 +73,5 @@ grep ";" dig.out.ns2
 $PERL ../digcomp.pl dig.out.ns1 dig.out.ns2
 status=`expr $status + $?`
 
-if [ $status != 0 ]; then
-	echo "R:FAIL"
-else
-	echo "R:PASS"
-fi
+echo "I: exit status: $status"
+exit $status