diff --git a/bin/tests/system/views/tests.sh b/bin/tests/system/views/tests.sh
index b0f2b3acc9..360712aa1f 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.14 2000/07/07 18:25:17 bwelling Exp $
+# $Id: tests.sh,v 1.15 2000/07/07 23:18:19 gson Exp $
 
 #
 # Perform tests
@@ -24,15 +24,14 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-status=0;
+status=0
+
 ../../../dig/dig +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd +noauth\
-	a.example. @10.53.0.2 any -p 5300 > dig.out.ns2.1
-status=`expr $status + $?`
+	a.example. @10.53.0.2 any -p 5300 > dig.out.ns2.1 || status=1
 grep ";" dig.out.ns2.1
 
 $DIG +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd +noauth\
-	a.example. @10.53.0.3 any -p 5300 > dig.out.ns3.1
-status=`expr $status + $?`
+	a.example. @10.53.0.3 any -p 5300 > dig.out.ns3.1 || status=1
 grep ";" dig.out.ns3.1
 
 rm -f ns2/named.conf ns3/named.conf ns2/example.db
@@ -45,34 +44,28 @@ kill -HUP `cat ns3/named.pid`
 sleep 60
 
 $DIG +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd +noauth\
-	-b 10.53.0.4 a.example. @10.53.0.4 any -p 5300 > dig.out.ns4.2
-status=`expr $status + $?`
+	-b 10.53.0.4 a.example. @10.53.0.4 any -p 5300 > dig.out.ns4.2 || status=1
 grep ";" dig.out.ns4.2
 
 $DIG +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd +noauth\
-	-b 10.53.0.2 a.example. @10.53.0.2 any -p 5300 > dig.out.ns2.2
-status=`expr $status + $?`
+	-b 10.53.0.2 a.example. @10.53.0.2 any -p 5300 > dig.out.ns2.2 || status=1
 grep ";" dig.out.ns2.2
 
 $DIG +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd +noauth\
-	@10.53.0.3 a.example. any -p 5300 > dig.out.ns3.2
-status=`expr $status + $?`
+	@10.53.0.3 a.example. any -p 5300 > dig.out.ns3.2 || status=1
 grep ";" dig.out.ns3.2
 
-$PERL ../digcomp.pl dig.out.ns2.1 dig.out.ns4.2
-status=`expr $status + $?`
+$PERL ../digcomp.pl dig.out.ns2.1 dig.out.ns4.2 || status=1
 
-$PERL ../digcomp.pl dig.out.ns3.1 dig.out.ns2.2
-status=`expr $status + $?`
+$PERL ../digcomp.pl dig.out.ns3.1 dig.out.ns2.2 || status=1
 
-$PERL ../digcomp.pl dig.out.ns3.1 dig.out.ns3.2
-status=`expr $status + $?`
+$PERL ../digcomp.pl dig.out.ns3.1 dig.out.ns3.2 || status=1
 
 echo "Differences should be found in the following lines:"
 $PERL ../digcomp.pl dig.out.ns2.1 dig.out.ns3.2
 if [ $? = 0 ]; then
 	echo "No differences found.  Something's wrong."
-	status=`expr $status + 1`
+	status=1
 fi
 
 echo "I:exit status: $status"
diff --git a/bin/tests/system/xferquota/tests.sh b/bin/tests/system/xferquota/tests.sh
index ca6860593c..810a7c5b57 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.14 2000/07/07 18:25:20 bwelling Exp $
+# $Id: tests.sh,v 1.15 2000/07/07 23:18:51 gson Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
@@ -43,34 +43,29 @@ while [ $count != 300 ]; do
 	echo "I:Have $count zones up in $seconds seconds"
 done
 
-status=0;
+status=0
+
 $DIG +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd \
-	zone000099.example. @10.53.0.1 axfr -p 5300 > dig.out.ns1
-status=`expr $status + $?`
+	zone000099.example. @10.53.0.1 axfr -p 5300 > dig.out.ns1 || status=1
 grep ";" dig.out.ns1
 
 $DIG +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd \
-	zone000099.example. @10.53.0.2 axfr -p 5300 > dig.out.ns2
-status=`expr $status + $?`
+	zone000099.example. @10.53.0.2 axfr -p 5300 > dig.out.ns2 || status=1
 grep ";" dig.out.ns2
 
-$PERL ../digcomp.pl dig.out.ns1 dig.out.ns2
-status=`expr $status + $?`
+$PERL ../digcomp.pl dig.out.ns1 dig.out.ns2 || status=1
 
 sleep 5
 
 $DIG +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd \
-	a.changing. @10.53.0.1 a -p 5300 > dig.out.ns1
-status=`expr $status + $?`
+	a.changing. @10.53.0.1 a -p 5300 > dig.out.ns1 || status=1
 grep ";" dig.out.ns1
 
 $DIG +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd \
-	a.changing. @10.53.0.2 a -p 5300 > dig.out.ns2
-status=`expr $status + $?`
+	a.changing. @10.53.0.2 a -p 5300 > dig.out.ns2 || status=1
 grep ";" dig.out.ns2
 
-$PERL ../digcomp.pl dig.out.ns1 dig.out.ns2
-status=`expr $status + $?`
+$PERL ../digcomp.pl dig.out.ns1 dig.out.ns2 || status=1
 
 echo "I:exit status: $status"
 exit $status