diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index dfbe8cd149..90baf02427 100644
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -29,76 +29,56 @@ rm -f dig.out.*
 DIGOPTS="+tcp +noadd +nosea +nostat +noquest +nocomm +nocmd -p 5300"
 
 # Check the example. domain
-$DIG $DIGOPTS \
-	a.example. @10.53.0.2 a > dig.out.ns2
-status=`expr $status + $?`
+$DIG $DIGOPTS a.example. @10.53.0.2 a > dig.out.ns2 || status=1
 grep ";" dig.out.ns2
 
-$DIG $DIGOPTS \
-	a.example. @10.53.0.3 a > dig.out.ns3
-status=`expr $status + $?`
+$DIG $DIGOPTS a.example. @10.53.0.3 a > dig.out.ns3 || status=1
 grep ";" dig.out.ns3
 
-$PERL ../digcomp.pl dig.out.ns2 dig.out.ns3
-status=`expr $status + $?`
+$PERL ../digcomp.pl dig.out.ns2 dig.out.ns3 || status=1
 
 rm -f dig.out.*
 
-$DIG $DIGOPTS +noauth \
-	a.example. @10.53.0.2 a > dig.out.ns2
-status=`expr $status + $?`
+$DIG $DIGOPTS +noauth a.example. @10.53.0.2 a > dig.out.ns2 || status=1
 grep ";" dig.out.ns2
 
-$DIG $DIGOPTS +noauth \
-	a.example. @10.53.0.4 a > dig.out.ns4
-status=`expr $status + $?`
+$DIG $DIGOPTS +noauth a.example. @10.53.0.4 a > dig.out.ns4 || status=1
 grep ";" dig.out.ns2
 
-$PERL ../digcomp.pl dig.out.ns2 dig.out.ns4
-status=`expr $status + $?`
+$PERL ../digcomp.pl dig.out.ns2 dig.out.ns4 || status=1
 
 # Check the insecure.example domain
 
 rm -f dig.out.*
 
-$DIG $DIGOPTS \
-	a.insecure.example. @10.53.0.3 a > dig.out.ns3
-status=`expr $status + $?`
+$DIG $DIGOPTS a.insecure.example. @10.53.0.3 a > dig.out.ns3 || status=1
 grep ";" dig.out.ns3
 
-$DIG $DIGOPTS \
-	a.insecure.example. @10.53.0.4 a > dig.out.ns4
-status=`expr $status + $?`
+$DIG $DIGOPTS a.insecure.example. @10.53.0.4 a > dig.out.ns4 || status=1
 grep ";" dig.out.ns4
 
-$PERL ../digcomp.pl dig.out.ns3 dig.out.ns4
-status=`expr $status + $?`
+$PERL ../digcomp.pl dig.out.ns3 dig.out.ns4 || status=1
 
 # Check the secure.example domain
 
 rm -f dig.out.*
 
-$DIG $DIGOPTS \
-	a.secure.example. @10.53.0.3 a > dig.out.ns3
-status=`expr $status + $?`
+$DIG $DIGOPTS a.secure.example. @10.53.0.3 a > dig.out.ns3 || status=1
 grep ";" dig.out.ns3
 
-$DIG $DIGOPTS \
-	a.secure.example. @10.53.0.4 a > dig.out.ns4
-status=`expr $status + $?`
+$DIG $DIGOPTS a.secure.example. @10.53.0.4 a > dig.out.ns4 || status=1
 grep ";" dig.out.ns4
 
-$PERL ../digcomp.pl dig.out.ns3 dig.out.ns4
-status=`expr $status + $?`
+$PERL ../digcomp.pl dig.out.ns3 dig.out.ns4 || status=1
 
 # Check the bogus domain
 
 rm -f dig.out.*
 
-$DIG +tcp +noadd +nosea +nostat +noquest +nocmd -p 5300 \
-	a.bogus.example. @10.53.0.4 a > dig.out.ns4
-grep "SERVFAIL" dig.out.ns4 > /dev/null
-status=`expr $status + $?`
+$DIG +tcp +noadd +nosea +nostat +noquest +nocmd -p 5300
+	a.bogus.example. @10.53.0.4 a > dig.out.ns4 || status=1
+grep "SERVFAIL" dig.out.ns4 > /dev/null || status=1
+
 echo "SERVFAIL is expected in the following:"
 grep ";" dig.out.ns4