diff --git a/tests/data/retcode.conf b/tests/data/retcode.conf
index f5db298732f001f27007485516fc20dd544f03d1..fd2774962a59f1fe79de423a0c9229509261d43a 100644
--- a/tests/data/retcode.conf
+++ b/tests/data/retcode.conf
@@ -1,5 +1,5 @@
 # slapo-retcode standard track response codes configuration example
-# $Header$
+# $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
 ## Copyright 1998-2008 The OpenLDAP Foundation.
diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf
index d87ff2803dbd144f13526f2cf6a5d0264b366018..225f81330512dbe6630f639e9f0f585c267665cb 100644
--- a/tests/data/slapd-acl.conf
+++ b/tests/data/slapd-acl.conf
@@ -1,6 +1,5 @@
 # master slapd config -- for testing
-# $OpenLDAP: pkg/ldap/tests/data/slapd-acl.conf,v 1.46.2.4 2003/12/15 22:05:29
-  kurt Exp $
+# $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
 ## Copyright 1998-2008 The OpenLDAP Foundation.
diff --git a/tests/data/slapd-cache-master.conf b/tests/data/slapd-cache-master.conf
index 0b7d338d754b41d69cdaf42b14020859e63df881..b9bb86fcc0e0a6d335f320154e1cbb97a4e246f4 100644
--- a/tests/data/slapd-cache-master.conf
+++ b/tests/data/slapd-cache-master.conf
@@ -1,6 +1,5 @@
 # master slapd config -- for proxy cache testing
-# $OpenLDAP: pkg/ldap/tests/data/slapd-cache-master.conf,v 1.2.2.4 2003/12/15 
- 22:05:29 kurt Exp $
+# $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
 ## Copyright 1998-2008 The OpenLDAP Foundation.
diff --git a/tests/data/slapd-chain1.conf b/tests/data/slapd-chain1.conf
index 2a208f9c476c3e3c11b8991a6b0f922d6218cc8b..ed7de05b59737311312ee69c01694cb61bcf1242 100644
--- a/tests/data/slapd-chain1.conf
+++ b/tests/data/slapd-chain1.conf
@@ -1,6 +1,5 @@
 # master slapd config -- for testing
-# $OpenLDAP: pkg/ldap/tests/data/slapd-pw.conf,v 1.19.2.4 2003/12/15 22:05:29 
- kurt Exp $
+# $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
 ## Copyright 1998-2008 The OpenLDAP Foundation.
diff --git a/tests/data/slapd-chain2.conf b/tests/data/slapd-chain2.conf
index abad2a352cfd9696d51a3d1243088baaa987531f..b51dc112b9e4bffd27aa5621828a43c564f3760a 100644
--- a/tests/data/slapd-chain2.conf
+++ b/tests/data/slapd-chain2.conf
@@ -1,6 +1,5 @@
 # master slapd config -- for testing
-# $OpenLDAP: pkg/ldap/tests/data/slapd-pw.conf,v 1.19.2.4 2003/12/15 22:05:29 
- kurt Exp $
+# $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
 ## Copyright 1998-2008 The OpenLDAP Foundation.
diff --git a/tests/data/slapd-component.conf b/tests/data/slapd-component.conf
index 2cff5e7dd571a24d64fcbb64c51f4cd2091fe6d0..ce0ec3cd85106be787ff511e3db2cd760d8689da 100644
--- a/tests/data/slapd-component.conf
+++ b/tests/data/slapd-component.conf
@@ -1,6 +1,5 @@
 # master slapd config -- for testing
-# $OpenLDAP: pkg/ldap/tests/data/slapd-master.conf,v 1.33.2.4 2003/12/15 22:05
- :29 kurt Exp $
+# $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
 ## Copyright 1998-2008 The OpenLDAP Foundation.
diff --git a/tests/data/slapd-deltasync-master.conf b/tests/data/slapd-deltasync-master.conf
index f840667c65efe213dc6f164fe5cd3807aa830454..4d4412138bd6df3aba48494f0a9642fa9ecdfd79 100644
--- a/tests/data/slapd-deltasync-master.conf
+++ b/tests/data/slapd-deltasync-master.conf
@@ -1,6 +1,5 @@
 # master slapd config -- for testing of Delta SYNC replication
-# $OpenLDAP: pkg/ldap/tests/data/slapd-syncrepl-master.conf,v 1.1.2.4 2003/12/
- 15 22:05:29 kurt Exp $
+# $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
 ## Copyright 1998-2008 The OpenLDAP Foundation.
diff --git a/tests/data/slapd-deltasync-slave.conf b/tests/data/slapd-deltasync-slave.conf
index 138cd6dba3442ebeee424a4e37d1fba20787cb83..1b0309d5cef334070958129d87cbf03dd464e58a 100644
--- a/tests/data/slapd-deltasync-slave.conf
+++ b/tests/data/slapd-deltasync-slave.conf
@@ -1,6 +1,5 @@
 # slave slapd config -- for testing of Delta SYNC replication
-# $OpenLDAP: pkg/ldap/tests/data/slapd-syncrepl-slave-persist1.conf,v 1.4.2.4 
- 2003/12/15 22:05:29 kurt Exp $
+# $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
 ## Copyright 1998-2008 The OpenLDAP Foundation.
diff --git a/tests/data/slapd-dnssrv.conf b/tests/data/slapd-dnssrv.conf
index 490eabfceeb371cb22adc0aaa883edcdf1eeada1..390090a8bb331bae1db715b7bbbbc2183402daa9 100644
--- a/tests/data/slapd-dnssrv.conf
+++ b/tests/data/slapd-dnssrv.conf
@@ -1,6 +1,5 @@
 # DNS SRV slapd config -- for testing
-# $OpenLDAP: pkg/ldap/tests/data/slapd-dnssrv.conf,v 1.10.2.2 2003/12/15 22:05
- :29 kurt Exp $
+# $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
 ## Copyright 1998-2008 The OpenLDAP Foundation.