diff --git a/bin/tests/system/dnssec/ns1/sign.sh b/bin/tests/system/dnssec/ns1/sign.sh
index 83310564fe..8b38444bea 100644
--- a/bin/tests/system/dnssec/ns1/sign.sh
+++ b/bin/tests/system/dnssec/ns1/sign.sh
@@ -18,25 +18,27 @@
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
+RANDFILE=../random.data
+
 zone=.
 infile=root.db.in
 zonefile=root.db
 
-keyname=`$KEYGEN -a RSA -b 768 -n zone $zone`
+keyname=`$KEYGEN -a RSA -b 768 -n zone -r $RANDFILE $zone`
 
 (cd ../ns2 && sh sign.sh )
 
 cp ../ns2/example.keyset .
 
-$KEYSIGNER example.keyset $keyname
+$KEYSIGNER -r $RANDFILE example.keyset $keyname
 
 cat example.signedkey >> ../ns2/example.db.signed
 
-$KEYSETTOOL -t 3600 $keyname
+$KEYSETTOOL -r $RANDFILE -t 3600 $keyname
 
 cat $infile $keyname.key > $zonefile
 
-$SIGNER -o $zone $zonefile
+$SIGNER -r $RANDFILE -o $zone $zonefile
 
 # Configure the resolving server with a trusted key.
 
diff --git a/bin/tests/system/dnssec/ns2/sign.sh b/bin/tests/system/dnssec/ns2/sign.sh
index 20a6b65b49..a2170e51ef 100644
--- a/bin/tests/system/dnssec/ns2/sign.sh
+++ b/bin/tests/system/dnssec/ns2/sign.sh
@@ -18,11 +18,13 @@
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
 
+RANDFILE=../random.data
+
 zone=example.
 infile=example.db.in
 zonefile=example.db
 
-keyname=`$KEYGEN -a RSA -b 768 -n zone $zone`
+keyname=`$KEYGEN -r $RANDFILE -a RSA -b 768 -n zone $zone`
 
 # Have the child generate a zone key and pass it to us,
 # sign it, and pass it back
@@ -31,7 +33,7 @@ keyname=`$KEYGEN -a RSA -b 768 -n zone $zone`
 
 cp ../ns3/secure.example.keyset .
 
-$KEYSIGNER secure.example.keyset $keyname
+$KEYSIGNER -r $RANDFILE secure.example.keyset $keyname
 
 # This will leave two copies of the child's zone key in the signed db file;
 # that shouldn't cause any problems.
@@ -39,17 +41,17 @@ cat secure.example.signedkey >>../ns3/secure.example.db.signed
 
 cp ../ns3/bogus.example.keyset .
 
-$KEYSIGNER bogus.example.keyset $keyname
+$KEYSIGNER -r $RANDFILE bogus.example.keyset $keyname
 
 # This will leave two copies of the child's zone key in the signed db file;
 # that shouldn't cause any problems.
 cat bogus.example.signedkey >>../ns3/bogus.example.db.signed
 
-$KEYSETTOOL -t 3600 $keyname
+$KEYSETTOOL -r $RANDFILE -t 3600 $keyname
 
 cat $infile $keyname.key >$zonefile
 
-$SIGNER -o $zone $zonefile
+$SIGNER -r $RANDFILE -o $zone $zonefile
 
 # Sign the privately secure file
 
@@ -57,8 +59,8 @@ privzone=private.secure.example.
 privinfile=private.secure.example.db.in
 privzonefile=private.secure.example.db
 
-privkeyname=`$KEYGEN -a RSA -b 768 -n zone $privzone`
+privkeyname=`$KEYGEN -r $RANDFILE -a RSA -b 768 -n zone $privzone`
 
 cat $privinfile $privkeyname.key >$privzonefile
 
-$SIGNER -o $privzone $privzonefile
+$SIGNER -r $RANDFILE -o $privzone $privzonefile
diff --git a/bin/tests/system/dnssec/ns3/sign.sh b/bin/tests/system/dnssec/ns3/sign.sh
index 7e7eb40b03..cc677e8bc6 100644
--- a/bin/tests/system/dnssec/ns3/sign.sh
+++ b/bin/tests/system/dnssec/ns3/sign.sh
@@ -15,26 +15,28 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
+RANDFILE=../random.data
+
 zone=secure.example.
 infile=secure.example.db.in
 zonefile=secure.example.db
 
-keyname=`$KEYGEN -a RSA -b 768 -n zone $zone`
+keyname=`$KEYGEN -r $RANDFILE -a RSA -b 768 -n zone $zone`
 
-$KEYSETTOOL -t 3600 $keyname.key
+$KEYSETTOOL -r $RANDFILE -t 3600 $keyname.key
 
 cat $infile $keyname.key >$zonefile
 
-$SIGNER -o $zone $zonefile
+$SIGNER -r $RANDFILE -o $zone $zonefile
 
 zone=bogus.example.
 infile=bogus.example.db.in
 zonefile=bogus.example.db
 
-keyname=`$KEYGEN -a RSA -b 768 -n zone $zone`
+keyname=`$KEYGEN -r $RANDFILE -a RSA -b 768 -n zone $zone`
 
-$KEYSETTOOL -t 3600 $keyname.key
+$KEYSETTOOL -r $RANDFILE -t 3600 $keyname.key
 
 cat $infile $keyname.key >$zonefile
 
-$SIGNER -o $zone $zonefile
+$SIGNER -r $RANDFILE -o $zone $zonefile
diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index 2a98318d30..cfc9fcb4c9 100644
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -15,8 +15,6 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
-echo "S:`date`"
-echo "T:system_dnssec:1"
 echo "A:A test to determine online functionality of dnssec tools"
 
 #
diff --git a/bin/tests/system/notify/tests.sh b/bin/tests/system/notify/tests.sh
index 83a82d2bbf..c08a450524 100644
--- a/bin/tests/system/notify/tests.sh
+++ b/bin/tests/system/notify/tests.sh
@@ -15,8 +15,6 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
-echo "S:`date`"
-echo "T:system_notify:1"
 echo "A:A test to determine online functionality of notify"
 
 #
diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index dc05b9c8d9..8e7632b8a1 100644
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -35,6 +35,9 @@ shift
 
 test -d $test || { echo "$0: $test: no such test" >&2; exit 1; }
 
+echo "S:`date`"
+echo "T:$test:1:A" >&2
+
 test -f /var/run/system_test_ifsetup ||
     { echo "I:Interfaces not set up.  Not trying system tests." >&2;
       exit 0;
@@ -67,4 +70,6 @@ sh stop.sh $test
 # Cleanup
 ( cd $test ; sh clean.sh )
 
+echo "E:$test:`date`"
+
 exit $status
diff --git a/bin/tests/system/views/tests.sh b/bin/tests/system/views/tests.sh
index 60b9c469c2..a01967e70e 100644
--- a/bin/tests/system/views/tests.sh
+++ b/bin/tests/system/views/tests.sh
@@ -15,8 +15,6 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
-echo "S:`date`"
-echo "T:system_views:1"
 echo "A:A test to determine online functionality of views"
 
 #
diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh
index aa89147370..8b04c1e210 100644
--- a/bin/tests/system/xfer/tests.sh
+++ b/bin/tests/system/xfer/tests.sh
@@ -18,8 +18,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-echo "S:`date`"
-echo "T:system_xfer:1"
 echo "A:A test to determine online functionality of zone transfers"
 
 #
diff --git a/bin/tests/system/xferquota/tests.sh b/bin/tests/system/xferquota/tests.sh
index cffa8fef9e..3ca6e2e103 100644
--- a/bin/tests/system/xferquota/tests.sh
+++ b/bin/tests/system/xferquota/tests.sh
@@ -18,8 +18,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-echo "S:`date`"
-echo "T:system_xferquota:1"
 echo "A:A test to determine online speed of zone transfers"
 
 #