diff --git a/tests/Makefile.in b/tests/Makefile.in
index a937823a22..8503b1d6b2 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,5 +1,7 @@
# Makefile.in for tests
# $OpenLDAP$
+## This work is part of OpenLDAP Software .
+##
## Copyright 1998-2003 The OpenLDAP Foundation.
## All rights reserved.
##
diff --git a/tests/data/ditcontentrules.conf b/tests/data/ditcontentrules.conf
index 905cc15cc1..dd8f36d39d 100644
--- a/tests/data/ditcontentrules.conf
+++ b/tests/data/ditcontentrules.conf
@@ -1,4 +1,17 @@
# $OpenLDAP$
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
+
ditcontentrule ( 2.5.6.4 NAME 'organization' AUX domainRelatedObject )
ditcontentrule ( 2.5.6.5 NAME 'organizationalUnit' AUX extensibleObject )
ditcontentrule ( 2.5.6.9 NAME 'groupOfNames' )
diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf
index 2a59e3d3b1..2c4a1f2573 100644
--- a/tests/data/slapd-acl.conf
+++ b/tests/data/slapd-acl.conf
@@ -1,7 +1,18 @@
-# $OpenLDAP$
-#
# master slapd config -- for testing
-#
+# $OpenLDAP$
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
+
ucdata-path ./ucdata
include ./schema/core.schema
include ./schema/cosine.schema
diff --git a/tests/data/slapd-cache-master.conf b/tests/data/slapd-cache-master.conf
index b9054cdc95..122e98fb4e 100644
--- a/tests/data/slapd-cache-master.conf
+++ b/tests/data/slapd-cache-master.conf
@@ -1,6 +1,18 @@
-#
# master slapd config -- for proxy cache testing
-#
+# $OpenLDAP$
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
+
ucdata-path ./ucdata
include ./schema/core.schema
include ./schema/cosine.schema
diff --git a/tests/data/slapd-dnssrv.conf b/tests/data/slapd-dnssrv.conf
index 1c1c5e89c5..b8eaf00801 100644
--- a/tests/data/slapd-dnssrv.conf
+++ b/tests/data/slapd-dnssrv.conf
@@ -1,7 +1,18 @@
-# $OpenLDAP$
-#
# DNS SRV slapd config -- for testing
-#
+# $OpenLDAP$
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
+
ucdata-path ./ucdata
include ./schema/core.schema
pidfile ./test-db/slapd.pid
diff --git a/tests/data/slapd-glue.conf b/tests/data/slapd-glue.conf
index 76822fbcaf..f942ab26c0 100644
--- a/tests/data/slapd-glue.conf
+++ b/tests/data/slapd-glue.conf
@@ -1,8 +1,18 @@
+# stand-alone slapd config -- for backglue testing (with indexing)
# $OpenLDAP$
-#
-# stand-alone slapd config -- for backglue testing
-# with indexing
-#
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
+
ucdata-path ./ucdata
include ./schema/core.schema
include ./schema/cosine.schema
diff --git a/tests/data/slapd-master.conf b/tests/data/slapd-master.conf
index 67cfad2c01..6d43331523 100644
--- a/tests/data/slapd-master.conf
+++ b/tests/data/slapd-master.conf
@@ -1,7 +1,18 @@
-# $OpenLDAP$
-#
# master slapd config -- for testing
-#
+# $OpenLDAP$
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
+
ucdata-path ./ucdata
include ./schema/core.schema
include ./schema/cosine.schema
diff --git a/tests/data/slapd-nis-master.conf b/tests/data/slapd-nis-master.conf
index 405f986f2b..fbf36868cb 100644
--- a/tests/data/slapd-nis-master.conf
+++ b/tests/data/slapd-nis-master.conf
@@ -1,8 +1,18 @@
+# master slapd config -- for testing (needs updating)
# $OpenLDAP$
-#
-# master slapd config -- for testing
-# needs updating
-#
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
+
ucdata-path ./ucdata
include ./schema/others_nis.at.conf
include ./schema/others_nis.oc.conf
diff --git a/tests/data/slapd-passwd.conf b/tests/data/slapd-passwd.conf
index ac3dc41071..ffe8d65216 100644
--- a/tests/data/slapd-passwd.conf
+++ b/tests/data/slapd-passwd.conf
@@ -1,7 +1,18 @@
-# $OpenLDAP$
-#
# master slapd config -- for testing
-#
+# $OpenLDAP$
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
+
ucdata-path ./ucdata
include ./schema/core.schema
include ./schema/cosine.schema
diff --git a/tests/data/slapd-proxycache.conf b/tests/data/slapd-proxycache.conf
index 7392f3e356..b8b74134e0 100644
--- a/tests/data/slapd-proxycache.conf
+++ b/tests/data/slapd-proxycache.conf
@@ -1,6 +1,18 @@
-#
# proxy cache slapd config
-#
+# $OpenLDAP$
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
+
ucdata-path ./ucdata
include ./schema/core.schema
include ./schema/cosine.schema
diff --git a/tests/data/slapd-pw.conf b/tests/data/slapd-pw.conf
index bb0ae11f01..25a0646f2a 100644
--- a/tests/data/slapd-pw.conf
+++ b/tests/data/slapd-pw.conf
@@ -1,7 +1,18 @@
-# $OpenLDAP$
-#
# master slapd config -- for testing
-#
+# $OpenLDAP$
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
+
ucdata-path ./ucdata
include ./schema/core.schema
include ./schema/cosine.schema
diff --git a/tests/data/slapd-ref-slave.conf b/tests/data/slapd-ref-slave.conf
index 9a9d9897f6..ffaab2a17e 100644
--- a/tests/data/slapd-ref-slave.conf
+++ b/tests/data/slapd-ref-slave.conf
@@ -1,7 +1,18 @@
-# $OpenLDAP$
-#
# slave slapd config -- for default referral testing
-#
+# $OpenLDAP$
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
+
ucdata-path ./ucdata
include ./schema/core.schema
include ./schema/cosine.schema
diff --git a/tests/data/slapd-referrals.conf b/tests/data/slapd-referrals.conf
index a24079d6dc..1715ed180c 100644
--- a/tests/data/slapd-referrals.conf
+++ b/tests/data/slapd-referrals.conf
@@ -1,7 +1,18 @@
-# $OpenLDAP$
-#
# referral slapd config -- for testing
-#
+# $OpenLDAP$
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
+
ucdata-path ./ucdata
include ./schema/core.schema
include ./schema/cosine.schema
diff --git a/tests/data/slapd-repl-master.conf b/tests/data/slapd-repl-master.conf
index 590b354261..d63f800cca 100644
--- a/tests/data/slapd-repl-master.conf
+++ b/tests/data/slapd-repl-master.conf
@@ -1,7 +1,18 @@
-# $OpenLDAP$
-#
# master slapd config -- for testing of replication
-#
+# $OpenLDAP$
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
+
ucdata-path ./ucdata
include ./schema/core.schema
include ./schema/cosine.schema
diff --git a/tests/data/slapd-repl-slave.conf b/tests/data/slapd-repl-slave.conf
index cdd78785a9..df8e27c917 100644
--- a/tests/data/slapd-repl-slave.conf
+++ b/tests/data/slapd-repl-slave.conf
@@ -1,7 +1,18 @@
-# $OpenLDAP$
-#
# slave slapd config -- for testing of replication
-#
+# $OpenLDAP$
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
+
ucdata-path ./ucdata
include ./schema/core.schema
include ./schema/cosine.schema
diff --git a/tests/data/slapd-schema.conf b/tests/data/slapd-schema.conf
index 37f79dba63..b01053a75c 100644
--- a/tests/data/slapd-schema.conf
+++ b/tests/data/slapd-schema.conf
@@ -1,8 +1,18 @@
+# stand-alone slapd config -- for testing (with indexing)
# $OpenLDAP$
-#
-# stand-alone slapd config -- for testing
-# with indexing
-#
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
+
ucdata-path ./ucdata
#
include ./schema/core.schema
diff --git a/tests/data/slapd-syncrepl-master.conf b/tests/data/slapd-syncrepl-master.conf
index 7e2fa3406e..35d51145dd 100644
--- a/tests/data/slapd-syncrepl-master.conf
+++ b/tests/data/slapd-syncrepl-master.conf
@@ -1,7 +1,18 @@
-# $OpenLDAP$
-#
# master slapd config -- for testing of SYNC replication
-#
+# $OpenLDAP$
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
+
ucdata-path ./ucdata
include ./schema/core.schema
include ./schema/cosine.schema
diff --git a/tests/data/slapd-syncrepl-slave-persist1.conf b/tests/data/slapd-syncrepl-slave-persist1.conf
index 381517481e..6a7c2016af 100644
--- a/tests/data/slapd-syncrepl-slave-persist1.conf
+++ b/tests/data/slapd-syncrepl-slave-persist1.conf
@@ -1,7 +1,18 @@
-# $OpenLDAP$
-#
# slave slapd config -- for testing of SYNC replication
-#
+# $OpenLDAP$
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
+
ucdata-path ./ucdata
include ./schema/core.schema
include ./schema/cosine.schema
diff --git a/tests/data/slapd-syncrepl-slave-persist2.conf b/tests/data/slapd-syncrepl-slave-persist2.conf
index 96d6e5eea6..7b9ca28a89 100644
--- a/tests/data/slapd-syncrepl-slave-persist2.conf
+++ b/tests/data/slapd-syncrepl-slave-persist2.conf
@@ -1,7 +1,6 @@
-# $OpenLDAP$
-#
# slave slapd config -- for testing of SYNC replication
-#
+# $OpenLDAP$
+
ucdata-path ./ucdata
include ./schema/core.schema
include ./schema/cosine.schema
diff --git a/tests/data/slapd-syncrepl-slave-persist3.conf b/tests/data/slapd-syncrepl-slave-persist3.conf
index 1b4b18f3b8..01cb1799d7 100644
--- a/tests/data/slapd-syncrepl-slave-persist3.conf
+++ b/tests/data/slapd-syncrepl-slave-persist3.conf
@@ -1,7 +1,18 @@
-# $OpenLDAP$
-#
# slave slapd config -- for testing of SYNC replication
-#
+# $OpenLDAP$
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
+
ucdata-path ./ucdata
include ./schema/core.schema
include ./schema/cosine.schema
diff --git a/tests/data/slapd-syncrepl-slave-refresh1.conf b/tests/data/slapd-syncrepl-slave-refresh1.conf
index f1e977b909..b4cfc380d5 100644
--- a/tests/data/slapd-syncrepl-slave-refresh1.conf
+++ b/tests/data/slapd-syncrepl-slave-refresh1.conf
@@ -1,7 +1,18 @@
-# $OpenLDAP$
-#
# slave slapd config -- for testing of SYNC replication
-#
+# $OpenLDAP$
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
+
ucdata-path ./ucdata
include ./schema/core.schema
include ./schema/cosine.schema
diff --git a/tests/data/slapd-syncrepl-slave-refresh2.conf b/tests/data/slapd-syncrepl-slave-refresh2.conf
index 4f63184125..64c6ccb6eb 100644
--- a/tests/data/slapd-syncrepl-slave-refresh2.conf
+++ b/tests/data/slapd-syncrepl-slave-refresh2.conf
@@ -1,7 +1,18 @@
-# $OpenLDAP$
-#
# slave slapd config -- for testing of SYNC replication
-#
+# $OpenLDAP$
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
+
ucdata-path ./ucdata
include ./schema/core.schema
include ./schema/cosine.schema
diff --git a/tests/data/slapd.conf b/tests/data/slapd.conf
index 350280aa87..9d6af807fc 100644
--- a/tests/data/slapd.conf
+++ b/tests/data/slapd.conf
@@ -1,8 +1,18 @@
+# stand-alone slapd config -- for testing (with indexing)
# $OpenLDAP$
-#
-# stand-alone slapd config -- for testing
-# with indexing
-#
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
+
ucdata-path ./ucdata
include ./schema/core.schema
include ./schema/cosine.schema
diff --git a/tests/data/slapd2.conf b/tests/data/slapd2.conf
index 1f4c1bbd93..296f2e9075 100644
--- a/tests/data/slapd2.conf
+++ b/tests/data/slapd2.conf
@@ -1,8 +1,18 @@
+# stand-alone slapd config -- for testing (with indexing)
# $OpenLDAP$
-#
-# stand-alone slapd config -- for testing
-# with indexing
-#
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
+
ucdata-path ./ucdata
include ./schema/core.schema
include ./schema/cosine.schema
diff --git a/tests/run.in b/tests/run.in
index 246a27a907..d085d51320 100644
--- a/tests/run.in
+++ b/tests/run.in
@@ -1,4 +1,16 @@
#!/bin/sh
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
USAGE="$0 [-b ] [-c] [-k] [-p] [-u] [-w]