diff --git a/CHANGES b/CHANGES
index 554e291cd1..469488b745 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2170.	[func]		Add acache processing to test suite. [RT #16711]
+
 2169.	[bug]		host, nslookup: when reporting NXDOMAIN report the
 			given name and not the last name searched for.
 			[RT #16763]
diff --git a/bin/tests/system/checknames/ns2/named.conf b/bin/tests/system/checknames/ns2/named.conf
index c167d3add8..103ed6496a 100644
--- a/bin/tests/system/checknames/ns2/named.conf
+++ b/bin/tests/system/checknames/ns2/named.conf
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.4 2004/03/05 04:59:41 marka Exp $ */
+/* $Id: named.conf,v 1.5 2007/04/26 04:06:49 marka Exp $ */
 
 controls { /* empty */ };
 
@@ -27,6 +27,7 @@ options {
         listen-on { 10.53.0.2; };
         listen-on-v6 { none; };
         recursion yes;
+	acache-enable yes;
 	check-names response warn;
         notify yes;
 };
diff --git a/bin/tests/system/checknames/ns3/named.conf b/bin/tests/system/checknames/ns3/named.conf
index 601368c185..e3d8e8a7d0 100644
--- a/bin/tests/system/checknames/ns3/named.conf
+++ b/bin/tests/system/checknames/ns3/named.conf
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.4 2004/03/05 04:59:45 marka Exp $ */
+/* $Id: named.conf,v 1.5 2007/04/26 04:06:49 marka Exp $ */
 
 controls { /* empty */ };
 
@@ -27,6 +27,7 @@ options {
         listen-on { 10.53.0.3; };
         listen-on-v6 { none; };
         recursion yes;
+	acache-enable yes;
 	check-names response fail;
         notify yes;
 };
diff --git a/bin/tests/system/dlv/ns5/named.conf b/bin/tests/system/dlv/ns5/named.conf
index a8143f2789..b35ac169e7 100644
--- a/bin/tests/system/dlv/ns5/named.conf
+++ b/bin/tests/system/dlv/ns5/named.conf
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.5 2006/03/10 00:23:21 marka Exp $ */
+/* $Id: named.conf,v 1.6 2007/04/26 04:06:49 marka Exp $ */
 
 /*
  * Choose a keyname that is unlikely to clash with any real key names.
@@ -56,6 +56,7 @@ options {
 	listen-on { 10.53.0.5; };
 	listen-on-v6 { none; };
 	recursion yes;
+	acache-enable yes;
 	notify yes;
 	dnssec-enable yes;
 	dnssec-validation yes;
diff --git a/bin/tests/system/dnssec/ns4/named.conf b/bin/tests/system/dnssec/ns4/named.conf
index 8736e69c3f..23952e6b19 100644
--- a/bin/tests/system/dnssec/ns4/named.conf
+++ b/bin/tests/system/dnssec/ns4/named.conf
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.25 2006/03/10 00:23:21 marka Exp $ */
+/* $Id: named.conf,v 1.26 2007/04/26 04:06:49 marka Exp $ */
 
 // NS4
 
@@ -30,6 +30,7 @@ options {
 	listen-on { 10.53.0.4; };
 	listen-on-v6 { none; };
 	recursion yes;
+	acache-enable yes;
 	dnssec-enable yes;
 	dnssec-validation yes;
 	dnssec-must-be-secure mustbesecure.example yes;
diff --git a/bin/tests/system/dnssec/ns5/named.conf b/bin/tests/system/dnssec/ns5/named.conf
index 7bc0d5c5e4..b9e1d1f06a 100644
--- a/bin/tests/system/dnssec/ns5/named.conf
+++ b/bin/tests/system/dnssec/ns5/named.conf
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.22 2006/03/10 00:23:21 marka Exp $ */
+/* $Id: named.conf,v 1.23 2007/04/26 04:06:49 marka Exp $ */
 
 // NS5
 
@@ -30,6 +30,7 @@ options {
 	listen-on { 10.53.0.5; };
 	listen-on-v6 { none; };
 	recursion yes;
+	acache-enable yes;
 	dnssec-enable yes;
 	dnssec-validation yes;
 };
diff --git a/bin/tests/system/dnssec/ns6/named.conf b/bin/tests/system/dnssec/ns6/named.conf
index c775d2766e..3611534493 100644
--- a/bin/tests/system/dnssec/ns6/named.conf
+++ b/bin/tests/system/dnssec/ns6/named.conf
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.9 2006/03/10 00:23:21 marka Exp $ */
+/* $Id: named.conf,v 1.10 2007/04/26 04:06:49 marka Exp $ */
 
 // NS6
 
@@ -29,6 +29,7 @@ options {
 	listen-on { 10.53.0.6; };
 	listen-on-v6 { none; };
 	recursion yes;
+	acache-enable yes;
 	notify yes;
 	disable-algorithms . { DSA; };
 	dnssec-enable yes;
diff --git a/bin/tests/system/notify/ns3/named.conf b/bin/tests/system/notify/ns3/named.conf
index 63b51b711d..ec79fb64e6 100644
--- a/bin/tests/system/notify/ns3/named.conf
+++ b/bin/tests/system/notify/ns3/named.conf
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.21 2004/03/05 05:01:51 marka Exp $ */
+/* $Id: named.conf,v 1.22 2007/04/26 04:06:49 marka Exp $ */
 
 controls { /* empty */ };
 
@@ -28,6 +28,7 @@ options {
 	listen-on { 10.53.0.3; };
 	listen-on-v6 { none; };
 	recursion yes;
+	acache-enable yes;
 	notify yes;
 };
 
diff --git a/bin/tests/system/nsupdate/ns2/named.conf b/bin/tests/system/nsupdate/ns2/named.conf
index d48809ae7e..ec4afb3043 100644
--- a/bin/tests/system/nsupdate/ns2/named.conf
+++ b/bin/tests/system/nsupdate/ns2/named.conf
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.11 2004/03/05 05:02:05 marka Exp $ */
+/* $Id: named.conf,v 1.12 2007/04/26 04:06:49 marka Exp $ */
 
 controls { /* empty */ };
 
@@ -28,6 +28,7 @@ options {
 	listen-on { 10.53.0.2; };
 	listen-on-v6 { none; };
 	recursion yes;
+	acache-enable yes;
 	notify yes;
 };
 
diff --git a/bin/tests/system/relay/ns3/named.conf b/bin/tests/system/relay/ns3/named.conf
index fab1accd6b..a4efd5b7a6 100644
--- a/bin/tests/system/relay/ns3/named.conf
+++ b/bin/tests/system/relay/ns3/named.conf
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.10 2004/03/05 05:02:22 marka Exp $ */
+/* $Id: named.conf,v 1.11 2007/04/26 04:06:49 marka Exp $ */
 
 controls { /* empty */ };
 
@@ -28,6 +28,7 @@ options {
 	listen-on { 10.53.0.3; };
 	listen-on-v6 { none; };
 	recursion yes;
+	acache-enable yes;
 	notify yes;
 };
 
diff --git a/bin/tests/system/relay/ns4/named.conf b/bin/tests/system/relay/ns4/named.conf
index a4a947b48d..8534f04fd8 100644
--- a/bin/tests/system/relay/ns4/named.conf
+++ b/bin/tests/system/relay/ns4/named.conf
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.10 2004/03/05 05:02:24 marka Exp $ */
+/* $Id: named.conf,v 1.11 2007/04/26 04:06:49 marka Exp $ */
 
 controls { /* empty */ };
 
@@ -28,6 +28,7 @@ options {
 	listen-on { 10.53.0.4; };
 	listen-on-v6 { none; };
 	recursion yes;
+	acache-enable yes;
 	notify yes;
 };
 
diff --git a/bin/tests/system/resolver/ns1/named.conf b/bin/tests/system/resolver/ns1/named.conf
index c930fc38d3..6581da4ede 100644
--- a/bin/tests/system/resolver/ns1/named.conf
+++ b/bin/tests/system/resolver/ns1/named.conf
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.10 2004/03/05 05:02:39 marka Exp $ */
+/* $Id: named.conf,v 1.11 2007/04/26 04:06:49 marka Exp $ */
 
 controls { /* empty */ };
 
@@ -28,6 +28,7 @@ options {
 	listen-on { 10.53.0.1; };
 	listen-on-v6 { none; };
 	recursion yes;
+	acache-enable yes;
 };
 
 zone "." {
diff --git a/bin/tests/system/rrsetorder/ns3/named.conf b/bin/tests/system/rrsetorder/ns3/named.conf
index 88bb88bf41..4cd3e7b803 100644
--- a/bin/tests/system/rrsetorder/ns3/named.conf
+++ b/bin/tests/system/rrsetorder/ns3/named.conf
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2 2006/03/03 00:43:35 marka Exp $ */
+/* $Id: named.conf,v 1.3 2007/04/26 04:06:49 marka Exp $ */
 
 controls { /* empty */ };
 
@@ -27,6 +27,7 @@ options {
 	listen-on { 10.53.0.3; };
 	listen-on-v6 { none; };
 	recursion yes;
+	acache-enable yes;
 	notify yes;
 	rrset-order {
 		name "fixed.example" order fixed;
diff --git a/bin/tests/system/stress/ns3/named.conf b/bin/tests/system/stress/ns3/named.conf
index ceaa839b16..d09b63bd38 100644
--- a/bin/tests/system/stress/ns3/named.conf
+++ b/bin/tests/system/stress/ns3/named.conf
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.5 2004/03/05 05:02:55 marka Exp $ */
+/* $Id: named.conf,v 1.6 2007/04/26 04:06:49 marka Exp $ */
 
 controls { /* empty */ };
 
@@ -28,6 +28,7 @@ options {
 	listen-on { 10.53.0.3; };
 	listen-on-v6 { none; };
 	recursion yes;
+	acache-enable yes;
 	notify yes;
 };
 
diff --git a/bin/tests/system/stress/ns4/named.conf b/bin/tests/system/stress/ns4/named.conf
index c805a44975..4bf3ad5ccd 100644
--- a/bin/tests/system/stress/ns4/named.conf
+++ b/bin/tests/system/stress/ns4/named.conf
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.5 2004/03/05 05:02:57 marka Exp $ */
+/* $Id: named.conf,v 1.6 2007/04/26 04:06:49 marka Exp $ */
 
 controls { /* empty */ };
 
@@ -28,6 +28,7 @@ options {
 	listen-on { 10.53.0.4; };
 	listen-on-v6 { none; };
 	recursion yes;
+	acache-enable yes;
 	notify yes;
 };
 
diff --git a/bin/tests/system/stub/ns3/named.conf b/bin/tests/system/stub/ns3/named.conf
index f272780d98..9a95a81d61 100644
--- a/bin/tests/system/stub/ns3/named.conf
+++ b/bin/tests/system/stub/ns3/named.conf
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.13 2004/03/05 05:03:08 marka Exp $ */
+/* $Id: named.conf,v 1.14 2007/04/26 04:06:49 marka Exp $ */
 
 controls { /* empty */ };
 
@@ -28,6 +28,7 @@ options {
 	listen-on { 10.53.0.3; };
 	listen-on-v6 { none; };
 	recursion yes;
+	acache-enable yes;
 	notify yes;
 };
 
diff --git a/bin/tests/system/upforwd/ns1/named.conf b/bin/tests/system/upforwd/ns1/named.conf
index b58db015f2..721a033c74 100644
--- a/bin/tests/system/upforwd/ns1/named.conf
+++ b/bin/tests/system/upforwd/ns1/named.conf
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.8 2004/03/05 05:03:26 marka Exp $ */
+/* $Id: named.conf,v 1.9 2007/04/26 04:06:50 marka Exp $ */
 
 key "update.example." {
 	algorithm "hmac-md5";
@@ -33,6 +33,7 @@ options {
 	listen-on { 10.53.0.1; };
 	listen-on-v6 { none; };
 	recursion yes;
+	acache-enable yes;
 	notify yes;
 };
 
diff --git a/bin/tests/system/upforwd/ns2/named.conf b/bin/tests/system/upforwd/ns2/named.conf
index 18160f2969..f9fa041166 100644
--- a/bin/tests/system/upforwd/ns2/named.conf
+++ b/bin/tests/system/upforwd/ns2/named.conf
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.7 2004/03/05 05:03:28 marka Exp $ */
+/* $Id: named.conf,v 1.8 2007/04/26 04:06:50 marka Exp $ */
 
 controls { /* empty */ };
 
@@ -28,6 +28,7 @@ options {
 	listen-on { 10.53.0.2; };
 	listen-on-v6 { none; };
 	recursion yes;
+	acache-enable yes;
 	notify yes;
 };
 
diff --git a/bin/tests/system/upforwd/ns3/named.conf b/bin/tests/system/upforwd/ns3/named.conf
index a678d589c0..6c3704a9bf 100644
--- a/bin/tests/system/upforwd/ns3/named.conf
+++ b/bin/tests/system/upforwd/ns3/named.conf
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.7 2004/03/05 05:03:31 marka Exp $ */
+/* $Id: named.conf,v 1.8 2007/04/26 04:06:50 marka Exp $ */
 
 controls { /* empty */ };
 
@@ -28,6 +28,7 @@ options {
 	listen-on { 10.53.0.3; };
 	listen-on-v6 { none; };
 	recursion yes;
+	acache-enable yes;
 	notify yes;
 };
 
diff --git a/bin/tests/system/v6synth/ns2/named.conf b/bin/tests/system/v6synth/ns2/named.conf
index 6df9bb1eeb..1a2e10e76a 100644
--- a/bin/tests/system/v6synth/ns2/named.conf
+++ b/bin/tests/system/v6synth/ns2/named.conf
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.3 2004/03/05 05:03:38 marka Exp $ */
+/* $Id: named.conf,v 1.4 2007/04/26 04:06:50 marka Exp $ */
 
 controls { /* empty */ };
 
@@ -28,6 +28,7 @@ options {
 	listen-on { 10.53.0.2; };
 	listen-on-v6 { none; };
 	recursion yes;
+	acache-enable yes;
 	notify yes;
 };
 
diff --git a/bin/tests/system/v6synth/ns3/named.conf b/bin/tests/system/v6synth/ns3/named.conf
index 1185679494..0f3dfe55a1 100644
--- a/bin/tests/system/v6synth/ns3/named.conf
+++ b/bin/tests/system/v6synth/ns3/named.conf
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.3 2004/03/05 05:03:40 marka Exp $ */
+/* $Id: named.conf,v 1.4 2007/04/26 04:06:50 marka Exp $ */
 
 controls { /* empty */ };
 
@@ -28,6 +28,7 @@ options {
 	listen-on { 10.53.0.3; };
 	listen-on-v6 { none; };
 	recursion yes;
+	acache-enable yes;
 	notify yes;
 	allow-v6-synthesis { any; };
 };
diff --git a/bin/tests/system/xfer/ns3/named.conf b/bin/tests/system/xfer/ns3/named.conf
index 181dece4c3..50dd551648 100644
--- a/bin/tests/system/xfer/ns3/named.conf
+++ b/bin/tests/system/xfer/ns3/named.conf
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.18 2004/03/05 05:04:01 marka Exp $ */
+/* $Id: named.conf,v 1.19 2007/04/26 04:06:50 marka Exp $ */
 
 controls { /* empty */ };
 
@@ -28,6 +28,7 @@ options {
 	listen-on { 10.53.0.3; };
 	listen-on-v6 { none; };
 	recursion yes;
+	acache-enable yes;
 	notify yes;
 };