diff --git a/bin/tests/system/dnssec/ns1/named.conf b/bin/tests/system/dnssec/ns1/named.conf
index e6900919e1..405ba7704a 100644
--- a/bin/tests/system/dnssec/ns1/named.conf
+++ b/bin/tests/system/dnssec/ns1/named.conf
@@ -1,11 +1,11 @@
 // NS1
 
 options {
+	query-source address 10.53.0.1 port 5300;
 	port 5300;
 	directory ".";
 	pid-file "named.pid";
 	listen-on { 10.53.0.1; };
-	query-source address 10.53.0.1;
 	recursion no;
 	notify yes;
 };
diff --git a/bin/tests/system/dnssec/ns2/named.conf b/bin/tests/system/dnssec/ns2/named.conf
index c2d14e91f9..de02bc47f0 100644
--- a/bin/tests/system/dnssec/ns2/named.conf
+++ b/bin/tests/system/dnssec/ns2/named.conf
@@ -1,10 +1,10 @@
 // NS2
 
 options {
+	query-source address 10.53.0.2 port 5300;
 	port 5300;
 	pid-file "named.pid";
 	listen-on { 10.53.0.2; };
-	query-source address 10.53.0.2;
 	recursion no;
 	notify yes;
 };
diff --git a/bin/tests/system/dnssec/ns3/named.conf b/bin/tests/system/dnssec/ns3/named.conf
index 159fd14442..bd122da188 100644
--- a/bin/tests/system/dnssec/ns3/named.conf
+++ b/bin/tests/system/dnssec/ns3/named.conf
@@ -1,10 +1,10 @@
 // NS3
 
 options {
+	query-source address 10.53.0.3 port 5300;
 	port 5300;
 	pid-file "named.pid";
 	listen-on { 10.53.0.3; };
-	query-source address 10.53.0.3;
 	recursion no;
 	notify yes;
 };
diff --git a/bin/tests/system/dnssec/ns4/named.conf b/bin/tests/system/dnssec/ns4/named.conf
index 33435fef04..2de429f680 100644
--- a/bin/tests/system/dnssec/ns4/named.conf
+++ b/bin/tests/system/dnssec/ns4/named.conf
@@ -1,11 +1,11 @@
 // NS4
 
 options {
+	query-source address 10.53.0.4 port 5300;
 	port 5300;
 	directory ".";
 	pid-file "named.pid";
 	listen-on { 10.53.0.4; };
-	query-source address 10.53.0.4;
 	recursion yes;
 };
 
diff --git a/bin/tests/system/dnssec/ns5/named.conf b/bin/tests/system/dnssec/ns5/named.conf
index 9ee5467418..85b1173722 100644
--- a/bin/tests/system/dnssec/ns5/named.conf
+++ b/bin/tests/system/dnssec/ns5/named.conf
@@ -1,11 +1,11 @@
 // NS5
 
 options {
+	query-source address 10.53.0.5 port 5300;
 	port 5300;
 	directory ".";
 	pid-file "named.pid";
 	listen-on { 10.53.0.5; };
-	query-source address 10.53.0.5;
 	recursion yes;
 };
 
diff --git a/bin/tests/system/notify/ns1/named.conf b/bin/tests/system/notify/ns1/named.conf
index 14175e2d8d..eb173c77b0 100644
--- a/bin/tests/system/notify/ns1/named.conf
+++ b/bin/tests/system/notify/ns1/named.conf
@@ -1,4 +1,5 @@
 options {
+	query-source address 10.53.0.1 port 5300;
 	port 5300;
 	directory ".";
 	pid-file "named.pid";
diff --git a/bin/tests/system/notify/ns2/named.conf b/bin/tests/system/notify/ns2/named.conf
index 33ac3ca44c..4d7b6040df 100644
--- a/bin/tests/system/notify/ns2/named.conf
+++ b/bin/tests/system/notify/ns2/named.conf
@@ -1,4 +1,5 @@
 options {
+	query-source address 10.53.0.2 port 5300;
 	port 5300;
 	pid-file "named.pid";
 	listen-on { 10.53.0.2; };
diff --git a/bin/tests/system/notify/ns3/named.conf b/bin/tests/system/notify/ns3/named.conf
index 7ae00830af..288edcd8e4 100644
--- a/bin/tests/system/notify/ns3/named.conf
+++ b/bin/tests/system/notify/ns3/named.conf
@@ -1,4 +1,5 @@
 options {
+	query-source address 10.53.0.1 port 5300;
 	port 5300;
 	directory ".";
 	pid-file "named.pid";
diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index d9b5fc15b9..2747e827d6 100644
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -42,6 +42,7 @@ echo "T:$test:1:A" >&2
 test -f /var/run/system_test_ifsetup ||
 test -f /etc/system_test_ifsetup ||
     { echo "I:Interfaces not set up.  Not trying system tests." >&2;
+      echo "R:UNTESTED" >&2
       echo "E:$test:`date`" >&2
       exit 0;
     }
diff --git a/bin/tests/system/start.sh b/bin/tests/system/start.sh
index 91022cdc88..511ffedc65 100644
--- a/bin/tests/system/start.sh
+++ b/bin/tests/system/start.sh
@@ -47,7 +47,7 @@ do
 	do
 	    x=`expr $x + 1`
 	    if [ $x = 5 ]; then
-		echo "I: Couldn't start servers!"
+		echo "I: Couldn't start server $d!"
 		exit 1
 	    fi
 	    sleep 1
diff --git a/bin/tests/system/views/ns1/named.conf b/bin/tests/system/views/ns1/named.conf
index 14175e2d8d..eb173c77b0 100644
--- a/bin/tests/system/views/ns1/named.conf
+++ b/bin/tests/system/views/ns1/named.conf
@@ -1,4 +1,5 @@
 options {
+	query-source address 10.53.0.1 port 5300;
 	port 5300;
 	directory ".";
 	pid-file "named.pid";
diff --git a/bin/tests/system/views/ns2/named1.conf b/bin/tests/system/views/ns2/named1.conf
index 2c6aa3d3b3..f70c64f014 100644
--- a/bin/tests/system/views/ns2/named1.conf
+++ b/bin/tests/system/views/ns2/named1.conf
@@ -1,4 +1,5 @@
 options {
+	query-source address 10.53.0.2 port 5300;
 	port 5300;
 	pid-file "named.pid";
 	listen-on { 10.53.0.2; };
diff --git a/bin/tests/system/views/ns2/named2.conf b/bin/tests/system/views/ns2/named2.conf
index 96ccc8d64a..071d787a00 100644
--- a/bin/tests/system/views/ns2/named2.conf
+++ b/bin/tests/system/views/ns2/named2.conf
@@ -1,4 +1,5 @@
 options {
+	query-source address 10.53.0.2 port 5300;
 	port 5300;
 	pid-file "named.pid";
 	listen-on { 10.53.0.2; 
diff --git a/bin/tests/system/views/ns3/named1.conf b/bin/tests/system/views/ns3/named1.conf
index ec7be97eb0..44ce2e59d9 100644
--- a/bin/tests/system/views/ns3/named1.conf
+++ b/bin/tests/system/views/ns3/named1.conf
@@ -1,4 +1,5 @@
 options {
+	query-source address 10.53.0.3 port 5300;
 	port 5300;
 	directory ".";
 	pid-file "named.pid";
diff --git a/bin/tests/system/views/ns3/named2.conf b/bin/tests/system/views/ns3/named2.conf
index 80c4288e09..94a44200f2 100644
--- a/bin/tests/system/views/ns3/named2.conf
+++ b/bin/tests/system/views/ns3/named2.conf
@@ -1,4 +1,5 @@
 options {
+	query-source address 10.53.0.3 port 5300;
 	port 5300;
 	directory ".";
 	pid-file "named.pid";
diff --git a/bin/tests/system/xfer/ns1/named.conf b/bin/tests/system/xfer/ns1/named.conf
index 14175e2d8d..eb173c77b0 100644
--- a/bin/tests/system/xfer/ns1/named.conf
+++ b/bin/tests/system/xfer/ns1/named.conf
@@ -1,4 +1,5 @@
 options {
+	query-source address 10.53.0.1 port 5300;
 	port 5300;
 	directory ".";
 	pid-file "named.pid";
diff --git a/bin/tests/system/xfer/ns2/named.conf b/bin/tests/system/xfer/ns2/named.conf
index 3526b2df3c..bc111c41d0 100644
--- a/bin/tests/system/xfer/ns2/named.conf
+++ b/bin/tests/system/xfer/ns2/named.conf
@@ -1,8 +1,8 @@
 options {
+	query-source address 10.53.0.2 port 5300;
 	port 5300;
 	pid-file "named.pid";
 	listen-on { 10.53.0.2; };
-	query-source address 10.53.0.2 port 1995;
 	recursion no;
 	notify yes;
 };
diff --git a/bin/tests/system/xfer/ns3/named.conf b/bin/tests/system/xfer/ns3/named.conf
index 31380fc549..5227f561dd 100644
--- a/bin/tests/system/xfer/ns3/named.conf
+++ b/bin/tests/system/xfer/ns3/named.conf
@@ -1,4 +1,5 @@
 options {
+	query-source address 10.53.0.3 port 5300;
 	port 5300;
 	directory ".";
 	pid-file "named.pid";
diff --git a/bin/tests/system/xferquota/ns1/named.conf b/bin/tests/system/xferquota/ns1/named.conf
index 5fffd1ee44..473e995391 100644
--- a/bin/tests/system/xferquota/ns1/named.conf
+++ b/bin/tests/system/xferquota/ns1/named.conf
@@ -1,4 +1,5 @@
 options {
+	query-source address 10.53.0.1 port 5300;
 	port 5300;
 	directory ".";
 	pid-file "named.pid";
diff --git a/bin/tests/system/xferquota/ns2/named.conf b/bin/tests/system/xferquota/ns2/named.conf
index f8976bb32f..f8e0f07170 100644
--- a/bin/tests/system/xferquota/ns2/named.conf
+++ b/bin/tests/system/xferquota/ns2/named.conf
@@ -1,4 +1,5 @@
 options {
+	query-source address 10.53.0.2 port 5300;
 	port 5300;
 	pid-file "named.pid";
 	listen-on { 10.53.0.2; };