diff --git a/bin/tests/system/forward/ns1/named.conf b/bin/tests/system/forward/ns1/named.conf
index b94bd8d978..69be8cab99 100644
--- a/bin/tests/system/forward/ns1/named.conf
+++ b/bin/tests/system/forward/ns1/named.conf
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.6 2001/01/09 21:43:12 bwelling Exp $ */
+/* $Id: named.conf,v 1.7 2001/03/09 18:49:54 bwelling Exp $ */
 
 options {
 	query-source address 10.53.0.1;
@@ -52,3 +52,8 @@ zone "example4." {
 	type master;
 	file "example.db";
 };
+
+zone "example5." {
+	type master;
+	file "example.db";
+};
diff --git a/bin/tests/system/forward/ns2/named.conf b/bin/tests/system/forward/ns2/named.conf
index 1a4b0a718b..cdf2bf29b3 100644
--- a/bin/tests/system/forward/ns2/named.conf
+++ b/bin/tests/system/forward/ns2/named.conf
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.6 2001/01/09 21:43:13 bwelling Exp $ */
+/* $Id: named.conf,v 1.7 2001/03/09 18:49:55 bwelling Exp $ */
 
 options {
 	query-source address 10.53.0.2;
@@ -47,3 +47,8 @@ zone "example3." {
 	type master;
 	file "example.db";
 };
+
+zone "example4." {
+	type master;
+	file "example.db";
+};
diff --git a/bin/tests/system/forward/ns3/named.conf b/bin/tests/system/forward/ns3/named.conf
index 3b3c1a0814..965032ec57 100644
--- a/bin/tests/system/forward/ns3/named.conf
+++ b/bin/tests/system/forward/ns3/named.conf
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.6 2001/01/09 21:43:15 bwelling Exp $ */
+/* $Id: named.conf,v 1.7 2001/03/09 18:49:56 bwelling Exp $ */
 
 options {
 	query-source address 10.53.0.3;
@@ -43,5 +43,12 @@ zone "example1." {
 zone "example2." {
 	type forward;
 	forward first;
+	forwarders { };
+};
+
+zone "example3." {
+	type forward;
+	forward only;
+	forwarders { };
 };
 
diff --git a/bin/tests/system/forward/ns4/named.conf b/bin/tests/system/forward/ns4/named.conf
index b3dd9abf46..9d2b37ea3b 100644
--- a/bin/tests/system/forward/ns4/named.conf
+++ b/bin/tests/system/forward/ns4/named.conf
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.6 2001/01/09 21:43:16 bwelling Exp $ */
+/* $Id: named.conf,v 1.7 2001/03/09 18:49:57 bwelling Exp $ */
 
 options {
 	query-source address 10.53.0.4;
@@ -43,7 +43,7 @@ zone "example3." {
 	forwarders { 10.53.0.2; };
 };
 
-zone "example4." {
+zone "example5." {
 	type forward;
 	forward only;
 	forwarders { 10.53.0.2; };
diff --git a/bin/tests/system/forward/tests.sh b/bin/tests/system/forward/tests.sh
index d8b80a3cfd..d33aaa4f0e 100644
--- a/bin/tests/system/forward/tests.sh
+++ b/bin/tests/system/forward/tests.sh
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.3 2001/01/09 21:43:11 bwelling Exp $
+# $Id: tests.sh,v 1.4 2001/03/09 18:49:52 bwelling Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
@@ -33,7 +33,15 @@ $PERL ../digcomp.pl dig.out.hidden dig.out.f1 || ret=1
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
-echo "I:checking that a forward zone with an empty forwarder list fails"
+echo "I:checking that a forward first zone no forwarders recurses"
+ret=0
+$DIG txt.example2. txt @$root -p 5300 > dig.out.root || ret=1
+$DIG txt.example2. txt @$f1 -p 5300 > dig.out.f1 || ret=1
+$PERL ../digcomp.pl dig.out.root dig.out.f1 || ret=1
+if [ $ret != 0 ]; then echo "I:failed"; fi
+status=`expr $status + $ret`
+
+echo "I:checking that a forward only zone no forwarders fails"
 ret=0
 $DIG txt.example2. txt @$root -p 5300 > dig.out.root || ret=1
 $DIG txt.example2. txt @$f1 -p 5300 > dig.out.f1 || ret=1
@@ -43,8 +51,8 @@ status=`expr $status + $ret`
 
 echo "I:checking that global forwarders work"
 ret=0
-$DIG txt.example3. txt @$hidden -p 5300 > dig.out.hidden || ret=1
-$DIG txt.example3. txt @$f1 -p 5300 > dig.out.f1 || ret=1
+$DIG txt.example4. txt @$hidden -p 5300 > dig.out.hidden || ret=1
+$DIG txt.example4. txt @$f1 -p 5300 > dig.out.f1 || ret=1
 $PERL ../digcomp.pl dig.out.hidden dig.out.f1 || ret=1
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
@@ -75,7 +83,7 @@ status=`expr $status + $ret`
 
 echo "I:checking that a forward only doesn't recurse"
 ret=0
-$DIG txt.example4. txt @$f2 -p 5300 > dig.out.f2 || ret=1
+$DIG txt.example5. txt @$f2 -p 5300 > dig.out.f2 || ret=1
 grep "SERVFAIL" dig.out.f2 > /dev/null || ret=1
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`