diff --git a/bin/tests/system/custom-test-driver b/bin/tests/system/custom-test-driver
index e880016580..e0371202c9 100755
--- a/bin/tests/system/custom-test-driver
+++ b/bin/tests/system/custom-test-driver
@@ -1,7 +1,7 @@
 #! /bin/sh
 # test-driver - basic testsuite driver script.
 
-scriptversion=2020-05-06.12; # UTC
+scriptversion=2020-05-12.10; # UTC
 
 # Copyright (C) 2011-2020 Free Software Foundation, Inc.
 #
@@ -116,6 +116,7 @@ else
   "$@" >$log_file 2>&1; echo $? > "$status_file"
 fi
 read -r estatus < "$status_file"
+rm "$status_file"
 
 if test $enable_hard_errors = no && test $estatus -eq 99; then
   tweaked_estatus=1
diff --git a/bin/tests/system/rsabigexponent/ns2/sign.sh b/bin/tests/system/rsabigexponent/ns2/sign.sh
index fa7aea80dc..82e51c61f7 100755
--- a/bin/tests/system/rsabigexponent/ns2/sign.sh
+++ b/bin/tests/system/rsabigexponent/ns2/sign.sh
@@ -23,4 +23,4 @@ done
 
 $SIGNER -g -s 20000101000000 -e 20361231235959 -o $zone \
 	$infile Kexample.+005+51829 Kexample.+005+51829 \
-	> /dev/null 2> signer.err
+	> /dev/null 2> signer.err || true
diff --git a/bin/tests/system/run.sh.in b/bin/tests/system/run.sh.in
index 6217160357..069ccad0ab 100644
--- a/bin/tests/system/run.sh.in
+++ b/bin/tests/system/run.sh.in
@@ -187,6 +187,9 @@ if test -f "$systest/clean.sh"
 then
     if ! ( cd "${systest}" && $SHELL clean.sh "$@" ); then
 	echowarn "I:$systest:clean.sh script failed"
+	echofail "R:$systest:FAIL"
+	echoend  "E:$systest:$(date_with_args)"
+	exit 1
     fi
 
 fi
@@ -195,7 +198,10 @@ fi
 if test -f "$systest/setup.sh"
 then
     if ! ( cd "${systest}" && $SHELL setup.sh "$@" ); then
-	echowarn "I:$systest:clean.sh script failed"
+	echowarn "I:$systest:setup.sh script failed"
+	echofail "R:$systest:FAIL"
+	echoend  "E:$systest:$(date_with_args)"
+	exit 1
     fi
 fi
 
diff --git a/bin/tests/system/statschannel/ns2/manykeys.db.in b/bin/tests/system/statschannel/ns2/manykeys.db.in
new file mode 100644
index 0000000000..5886edf2c2
--- /dev/null
+++ b/bin/tests/system/statschannel/ns2/manykeys.db.in
@@ -0,0 +1,26 @@
+; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+;
+; This Source Code Form is subject to the terms of the Mozilla Public
+; License, v. 2.0. If a copy of the MPL was not distributed with this
+; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
+$ORIGIN .
+$TTL 300
+
+manykeys.			IN SOA	mname1. . (
+				1          ; serial
+				20         ; refresh (20 seconds)
+				20         ; retry (20 seconds)
+				1814400    ; expire (3 weeks)
+				3600       ; minimum (1 hour)
+				)
+manykeys.			NS	ns2.manykeys.
+ns2.manykeys.		A	10.53.0.2
+
+$ORIGIN manykeys.
+a			A	10.0.0.1
+			MX	10 mail.manykeys.
+mail			A	10.0.0.2