diff --git a/bin/tests/system/dnssec/ns1/named.conf b/bin/tests/system/dnssec/ns1/named.conf
index c25fba41ee..b1e9bf0463 100644
--- a/bin/tests/system/dnssec/ns1/named.conf
+++ b/bin/tests/system/dnssec/ns1/named.conf
@@ -15,14 +15,13 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.11 2000/08/01 01:14:35 tale Exp $ */
+/* $Id: named.conf,v 1.12 2000/09/01 19:27:11 gson Exp $ */
 
 // NS1
 
 options {
 	query-source address 10.53.0.1;
 	port 5300;
-	directory ".";
 	pid-file "named.pid";
 	listen-on { 10.53.0.1; };
 	listen-on-v6 {none;};
diff --git a/bin/tests/system/dnssec/ns4/named.conf b/bin/tests/system/dnssec/ns4/named.conf
index f2e848ca24..7807b50160 100644
--- a/bin/tests/system/dnssec/ns4/named.conf
+++ b/bin/tests/system/dnssec/ns4/named.conf
@@ -15,14 +15,13 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.12 2000/08/01 01:14:51 tale Exp $ */
+/* $Id: named.conf,v 1.13 2000/09/01 19:27:13 gson Exp $ */
 
 // NS4
 
 options {
 	query-source address 10.53.0.4;
 	port 5300;
-	directory ".";
 	pid-file "named.pid";
 	listen-on { 10.53.0.4; };
 	listen-on-v6 {none;};
diff --git a/bin/tests/system/dnssec/ns5/named.conf b/bin/tests/system/dnssec/ns5/named.conf
index d281f60a72..a16ccfa06c 100644
--- a/bin/tests/system/dnssec/ns5/named.conf
+++ b/bin/tests/system/dnssec/ns5/named.conf
@@ -15,14 +15,13 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.10 2000/08/01 01:14:54 tale Exp $ */
+/* $Id: named.conf,v 1.11 2000/09/01 19:27:14 gson Exp $ */
 
 // NS5
 
 options {
 	query-source address 10.53.0.5;
 	port 5300;
-	directory ".";
 	pid-file "named.pid";
 	listen-on { 10.53.0.5; };
 	listen-on-v6 {none;};
diff --git a/bin/tests/system/forward/ns1/named.conf b/bin/tests/system/forward/ns1/named.conf
index 0119c73cfc..ca98d2e6ac 100644
--- a/bin/tests/system/forward/ns1/named.conf
+++ b/bin/tests/system/forward/ns1/named.conf
@@ -15,12 +15,11 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.1 2000/08/24 22:23:44 bwelling Exp $ */
+/* $Id: named.conf,v 1.2 2000/09/01 19:35:58 gson Exp $ */
 
 options {
 	query-source address 10.53.0.1;
 	port 5300;
-	directory ".";
 	pid-file "named.pid";
 	listen-on { 10.53.0.1; };
 	listen-on-v6 {none;};
diff --git a/bin/tests/system/forward/ns2/named.conf b/bin/tests/system/forward/ns2/named.conf
index ce3bb92d42..6e756e9073 100644
--- a/bin/tests/system/forward/ns2/named.conf
+++ b/bin/tests/system/forward/ns2/named.conf
@@ -15,12 +15,11 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.1 2000/08/24 22:23:45 bwelling Exp $ */
+/* $Id: named.conf,v 1.2 2000/09/01 19:35:59 gson Exp $ */
 
 options {
 	query-source address 10.53.0.2;
 	port 5300;
-	directory ".";
 	pid-file "named.pid";
 	listen-on { 10.53.0.2; };
 	listen-on-v6 {none;};
diff --git a/bin/tests/system/forward/ns3/named.conf b/bin/tests/system/forward/ns3/named.conf
index 68a0231bb6..782a061f20 100644
--- a/bin/tests/system/forward/ns3/named.conf
+++ b/bin/tests/system/forward/ns3/named.conf
@@ -15,12 +15,11 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.1 2000/08/24 22:23:46 bwelling Exp $ */
+/* $Id: named.conf,v 1.2 2000/09/01 19:36:00 gson Exp $ */
 
 options {
 	query-source address 10.53.0.3;
 	port 5300;
-	directory ".";
 	pid-file "named.pid";
 	listen-on { 10.53.0.3; };
 	listen-on-v6 {none;};
diff --git a/bin/tests/system/forward/ns4/named.conf b/bin/tests/system/forward/ns4/named.conf
index cb0f5d9a6d..169c2be89e 100644
--- a/bin/tests/system/forward/ns4/named.conf
+++ b/bin/tests/system/forward/ns4/named.conf
@@ -15,12 +15,11 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.1 2000/08/24 22:23:46 bwelling Exp $ */
+/* $Id: named.conf,v 1.2 2000/09/01 19:36:02 gson Exp $ */
 
 options {
 	query-source address 10.53.0.4;
 	port 5300;
-	directory ".";
 	pid-file "named.pid";
 	listen-on { 10.53.0.4; };
 	listen-on-v6 {none;};
diff --git a/bin/tests/system/glue/ns1/named.conf b/bin/tests/system/glue/ns1/named.conf
index bc6acf5b9d..a26134793c 100644
--- a/bin/tests/system/glue/ns1/named.conf
+++ b/bin/tests/system/glue/ns1/named.conf
@@ -15,12 +15,11 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.3 2000/08/01 01:15:02 tale Exp $ */
+/* $Id: named.conf,v 1.4 2000/09/01 19:27:15 gson Exp $ */
 
 options {
 	query-source address 10.53.0.1;
 	port 5300;
-	directory ".";
 	pid-file "named.pid";
 	listen-on { 10.53.0.1; };
 	listen-on-v6 { none ; };
diff --git a/bin/tests/system/limits/ns1/named.conf b/bin/tests/system/limits/ns1/named.conf
index d1b57a58ea..adcc75af7f 100644
--- a/bin/tests/system/limits/ns1/named.conf
+++ b/bin/tests/system/limits/ns1/named.conf
@@ -15,12 +15,11 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.5 2000/08/01 01:15:33 tale Exp $ */
+/* $Id: named.conf,v 1.6 2000/09/01 19:27:16 gson Exp $ */
 
 options {
 	query-source address 10.53.0.1;
 	port 5300;
-	directory ".";
 	pid-file "named.pid";
 	listen-on { 10.53.0.1; };
 	listen-on-v6 {none;};
diff --git a/bin/tests/system/lwresd/ns1/named.conf b/bin/tests/system/lwresd/ns1/named.conf
index 33de7aa81a..16a040ddd0 100644
--- a/bin/tests/system/lwresd/ns1/named.conf
+++ b/bin/tests/system/lwresd/ns1/named.conf
@@ -15,12 +15,11 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.6 2000/08/01 01:15:50 tale Exp $ */
+/* $Id: named.conf,v 1.7 2000/09/01 19:27:17 gson Exp $ */
 
 options {
 	query-source address 10.53.0.1;
 	port 5300;
-	directory ".";
 	pid-file "named.pid";
 	listen-on { 10.53.0.1; };
 	listen-on-v6 {none;};
diff --git a/bin/tests/system/notify/ns1/named.conf b/bin/tests/system/notify/ns1/named.conf
index 16bac3b9f3..9632683afb 100644
--- a/bin/tests/system/notify/ns1/named.conf
+++ b/bin/tests/system/notify/ns1/named.conf
@@ -15,12 +15,11 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.9 2000/08/01 01:15:58 tale Exp $ */
+/* $Id: named.conf,v 1.10 2000/09/01 19:27:19 gson Exp $ */
 
 options {
 	query-source address 10.53.0.1;
 	port 5300;
-	directory ".";
 	pid-file "named.pid";
 	listen-on { 10.53.0.1; };
 	listen-on-v6 {none;};
diff --git a/bin/tests/system/notify/ns3/named.conf b/bin/tests/system/notify/ns3/named.conf
index 08723e6d10..b167df8a7a 100644
--- a/bin/tests/system/notify/ns3/named.conf
+++ b/bin/tests/system/notify/ns3/named.conf
@@ -15,12 +15,11 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.12 2000/08/01 01:16:07 tale Exp $ */
+/* $Id: named.conf,v 1.13 2000/09/01 19:27:20 gson Exp $ */
 
 options {
 	query-source address 10.53.0.3;
 	port 5300;
-	directory ".";
 	pid-file "named.pid";
 	listen-on { 10.53.0.3; };
 	listen-on-v6 {none;};
diff --git a/bin/tests/system/nsupdate/ns2/named.conf b/bin/tests/system/nsupdate/ns2/named.conf
index 2556f44da7..1ae7e7faa1 100644
--- a/bin/tests/system/nsupdate/ns2/named.conf
+++ b/bin/tests/system/nsupdate/ns2/named.conf
@@ -15,12 +15,11 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.4 2000/08/01 01:16:20 tale Exp $ */
+/* $Id: named.conf,v 1.5 2000/09/01 19:29:44 gson Exp $ */
 
 options {
 	query-source address 10.53.0.2;
 	port 5300;
-	directory ".";
 	pid-file "named.pid";
 	listen-on { 10.53.0.2; };
 	listen-on-v6 {none;};
diff --git a/bin/tests/system/relay/ns1/named.conf b/bin/tests/system/relay/ns1/named.conf
index 7a2c02f579..aa120a0c6e 100644
--- a/bin/tests/system/relay/ns1/named.conf
+++ b/bin/tests/system/relay/ns1/named.conf
@@ -15,12 +15,11 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.1 2000/08/17 09:18:02 marka Exp $ */
+/* $Id: named.conf,v 1.2 2000/09/01 19:36:03 gson Exp $ */
 
 options {
 	query-source address 10.53.0.1;
 	port 5300;
-	directory ".";
 	pid-file "named.pid";
 	listen-on { 10.53.0.1; };
 	listen-on-v6 {none;};
diff --git a/bin/tests/system/relay/ns3/named.conf b/bin/tests/system/relay/ns3/named.conf
index 14f535dcaa..1662bb3f5f 100644
--- a/bin/tests/system/relay/ns3/named.conf
+++ b/bin/tests/system/relay/ns3/named.conf
@@ -15,12 +15,11 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2 2000/08/22 05:14:45 marka Exp $ */
+/* $Id: named.conf,v 1.3 2000/09/01 19:36:04 gson Exp $ */
 
 options {
 	query-source address 10.53.0.3;
 	port 5300;
-	directory ".";
 	pid-file "named.pid";
 	listen-on { 10.53.0.3; };
 	listen-on-v6 {none;};
diff --git a/bin/tests/system/relay/ns4/named.conf b/bin/tests/system/relay/ns4/named.conf
index 61718f4ae6..4600697644 100644
--- a/bin/tests/system/relay/ns4/named.conf
+++ b/bin/tests/system/relay/ns4/named.conf
@@ -15,12 +15,11 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2 2000/08/22 05:14:46 marka Exp $ */
+/* $Id: named.conf,v 1.3 2000/09/01 19:36:05 gson Exp $ */
 
 options {
 	query-source address 10.53.0.4;
 	port 5300;
-	directory ".";
 	pid-file "named.pid";
 	listen-on { 10.53.0.4; };
 	listen-on-v6 {none;};
diff --git a/bin/tests/system/resolver/ns1/named.conf b/bin/tests/system/resolver/ns1/named.conf
index 1e2aaa9e7b..939d44039f 100644
--- a/bin/tests/system/resolver/ns1/named.conf
+++ b/bin/tests/system/resolver/ns1/named.conf
@@ -15,12 +15,11 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.3 2000/08/01 01:16:27 tale Exp $ */
+/* $Id: named.conf,v 1.4 2000/09/01 19:29:45 gson Exp $ */
 
 options {
 	query-source address 10.53.0.1;
 	port 5300;
-	directory ".";
 	pid-file "named.pid";
 	listen-on { 10.53.0.1; };
 	listen-on-v6 {none;};
diff --git a/bin/tests/system/stub/ns1/named.conf b/bin/tests/system/stub/ns1/named.conf
index a689a755da..c614a9cfc2 100644
--- a/bin/tests/system/stub/ns1/named.conf
+++ b/bin/tests/system/stub/ns1/named.conf
@@ -15,12 +15,11 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.5 2000/08/01 01:16:35 tale Exp $ */
+/* $Id: named.conf,v 1.6 2000/09/01 19:29:46 gson Exp $ */
 
 options {
 	query-source address 10.53.0.1;
 	port 5300;
-	directory ".";
 	pid-file "named.pid";
 	listen-on { 10.53.0.1; };
 	listen-on-v6 {none;};
diff --git a/bin/tests/system/stub/ns3/named.conf b/bin/tests/system/stub/ns3/named.conf
index 95896b1c69..381a24ae3b 100644
--- a/bin/tests/system/stub/ns3/named.conf
+++ b/bin/tests/system/stub/ns3/named.conf
@@ -15,12 +15,11 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.5 2000/08/01 01:16:43 tale Exp $ */
+/* $Id: named.conf,v 1.6 2000/09/01 19:29:47 gson Exp $ */
 
 options {
 	query-source address 10.53.0.3;
 	port 5300;
-	directory ".";
 	pid-file "named.pid";
 	listen-on { 10.53.0.3; };
 	listen-on-v6 {none;};
diff --git a/bin/tests/system/views/ns1/named.conf b/bin/tests/system/views/ns1/named.conf
index 4d9728c2f1..5ff47e1e8d 100644
--- a/bin/tests/system/views/ns1/named.conf
+++ b/bin/tests/system/views/ns1/named.conf
@@ -15,12 +15,11 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.8 2000/08/01 01:16:51 tale Exp $ */
+/* $Id: named.conf,v 1.9 2000/09/01 19:29:49 gson Exp $ */
 
 options {
 	query-source address 10.53.0.1;
 	port 5300;
-	directory ".";
 	pid-file "named.pid";
 	listen-on { 10.53.0.1; };
 	listen-on-v6 {none;};
diff --git a/bin/tests/system/xfer/ns1/named.conf b/bin/tests/system/xfer/ns1/named.conf
index 10b89508f8..8920b7d6b6 100644
--- a/bin/tests/system/xfer/ns1/named.conf
+++ b/bin/tests/system/xfer/ns1/named.conf
@@ -15,12 +15,11 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.9 2000/08/01 01:17:08 tale Exp $ */
+/* $Id: named.conf,v 1.10 2000/09/01 19:31:46 gson Exp $ */
 
 options {
 	query-source address 10.53.0.1;
 	port 5300;
-	directory ".";
 	pid-file "named.pid";
 	listen-on { 10.53.0.1; };
 	listen-on-v6 {none;};
diff --git a/bin/tests/system/xfer/ns3/named.conf b/bin/tests/system/xfer/ns3/named.conf
index 3309363dbc..579f6b5a8e 100644
--- a/bin/tests/system/xfer/ns3/named.conf
+++ b/bin/tests/system/xfer/ns3/named.conf
@@ -15,12 +15,11 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.9 2000/08/01 01:17:16 tale Exp $ */
+/* $Id: named.conf,v 1.10 2000/09/01 19:31:47 gson Exp $ */
 
 options {
 	query-source address 10.53.0.3;
 	port 5300;
-	directory ".";
 	pid-file "named.pid";
 	listen-on { 10.53.0.3; };
 	listen-on-v6 {none;};
diff --git a/bin/tests/system/xferquota/ns1/named.conf b/bin/tests/system/xferquota/ns1/named.conf
index 60cb4dae38..c71c4d443a 100644
--- a/bin/tests/system/xferquota/ns1/named.conf
+++ b/bin/tests/system/xferquota/ns1/named.conf
@@ -15,12 +15,11 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.12 2000/08/01 01:17:25 tale Exp $ */
+/* $Id: named.conf,v 1.13 2000/09/01 19:29:50 gson Exp $ */
 
 options {
 	query-source address 10.53.0.1;
 	port 5300;
-	directory ".";
 	pid-file "named.pid";
 	listen-on { 10.53.0.1; };
 	listen-on-v6 {none;};