diff --git a/tests/data/passwd.ldif b/tests/data/passwd.ldif
index a405003ef766e53b8083bef89d3108af04a08459..d716d67081b9fa392894fe2db1dbe54f5efe2651 100644
--- a/tests/data/passwd.ldif
+++ b/tests/data/passwd.ldif
@@ -7,22 +7,26 @@ dn: cn=md5, o=University of Michigan, c=US
 objectclass: top
 objectclass: person
 cn: md5
+sn: md5
 userpassword:: e01ENX1YcjRpbE96UTRQQ09xM2FRMHFidWFRPT0=
 
 dn: cn=smd5, o=University of Michigan, c=US
 objectclass: top
 objectclass: person
 cn: smd5
+sn: smd5
 userpassword: secret
 
 dn: cn=sha, o=University of Michigan, c=US
 objectclass: top
 objectclass: person
 cn: sha
+sn: sha
 userpassword:: e1NIQX01ZW42RzZNZXpScm9UM1hLcWtkUE9tWS9CZlE9
 
 dn: cn=ssha, o=University of Michigan, c=US
 objectclass: top
 objectclass: person
 cn: ssha
+sn: ssha
 userpassword: secret
diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf
index 3d7987794d554878ffdb5b56b515dbd75a40e865..1a7b2b1ea545494d9fa504f30743fb8a30ce3c38 100644
--- a/tests/data/slapd-acl.conf
+++ b/tests/data/slapd-acl.conf
@@ -7,7 +7,6 @@ include ./schema/core.schema
 include ./schema/cosine.schema
 include ./schema/inetorgperson.schema
 include ./schema/openldap.schema
-schemacheck	off
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args
 
diff --git a/tests/data/slapd-dnssrv.conf b/tests/data/slapd-dnssrv.conf
index 68a8ca683ee1775cbe0c3fb15169ca024b4e7920..60fef032510c153e57b173f517f540e8c12265f6 100644
--- a/tests/data/slapd-dnssrv.conf
+++ b/tests/data/slapd-dnssrv.conf
@@ -4,7 +4,6 @@
 #
 ucdata-path	./ucdata
 include ./schema/core.schema
-schemacheck	on
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args
 
diff --git a/tests/data/slapd-glue.conf b/tests/data/slapd-glue.conf
index bbe2c22011e823bceecf2e923af051c402038501..5bf85b1a8e9c27f8b071c40836a6d5cca19c5506 100644
--- a/tests/data/slapd-glue.conf
+++ b/tests/data/slapd-glue.conf
@@ -8,7 +8,6 @@ include ./schema/core.schema
 include ./schema/cosine.schema
 include ./schema/inetorgperson.schema
 include ./schema/openldap.schema
-schemacheck	on
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args
 
diff --git a/tests/data/slapd-master.conf b/tests/data/slapd-master.conf
index 4dc100979155e0f07ba5907db7d3132d7de2a480..2d4e879bd41640b000ee6baf8cb5b4db38ba20bd 100644
--- a/tests/data/slapd-master.conf
+++ b/tests/data/slapd-master.conf
@@ -7,7 +7,6 @@ include ./schema/core.schema
 include ./schema/cosine.schema
 include ./schema/inetorgperson.schema
 include ./schema/openldap.schema
-schemacheck	on
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args
 
diff --git a/tests/data/slapd-nis-master.conf b/tests/data/slapd-nis-master.conf
index a0869d3275e5cc9fc9b818dc00510ab02aafd86f..dc56ac87e187cf44cb742b596e11b13590fec932 100644
--- a/tests/data/slapd-nis-master.conf
+++ b/tests/data/slapd-nis-master.conf
@@ -10,7 +10,6 @@ include		./schema/nis.at.conf
 include		./schema/nis.oc.conf
 include		./schema/internet_mail.at.conf
 include		./schema/internet_mail.oc.conf
-schemacheck	on
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args
 
diff --git a/tests/data/slapd-passwd.conf b/tests/data/slapd-passwd.conf
index 4af2458c94cbb0a793eac63d1ee50b5d48f4b8fa..1238d24649f04a5c3a62a0499bdd3a91f5a9cfb1 100644
--- a/tests/data/slapd-passwd.conf
+++ b/tests/data/slapd-passwd.conf
@@ -7,7 +7,6 @@ include ./schema/core.schema
 include ./schema/cosine.schema
 include ./schema/inetorgperson.schema
 include ./schema/openldap.schema
-schemacheck	on
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args
 
diff --git a/tests/data/slapd-pw.conf b/tests/data/slapd-pw.conf
index 8d3f2d9a045d128b993ad0dca302023c03f6327f..9f552afe509d7a3733dd914b0bb80b89e30918e4 100644
--- a/tests/data/slapd-pw.conf
+++ b/tests/data/slapd-pw.conf
@@ -7,7 +7,6 @@ include ./schema/core.schema
 include ./schema/cosine.schema
 include ./schema/inetorgperson.schema
 include ./schema/openldap.schema
-schemacheck	off
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args
 
diff --git a/tests/data/slapd-ref-slave.conf b/tests/data/slapd-ref-slave.conf
index e6c3e667a333ba55883e1a2df4c6d7a4a159351b..f9335b767bcdd5ebed8e14d53c319874f8eeb70b 100644
--- a/tests/data/slapd-ref-slave.conf
+++ b/tests/data/slapd-ref-slave.conf
@@ -8,8 +8,6 @@ include ./schema/cosine.schema
 include ./schema/inetorgperson.schema
 include ./schema/openldap.schema
 #
-schemacheck	off
-#
 pidfile     ./test-repl/slapd.pid
 argsfile    ./test-repl/slapd.args
 
diff --git a/tests/data/slapd-repl-master.conf b/tests/data/slapd-repl-master.conf
index 7238b42f6b3922493e87702e602fedaecbef6a6f..48c1c1b9b30486c4bd428186112af76e828e65f1 100644
--- a/tests/data/slapd-repl-master.conf
+++ b/tests/data/slapd-repl-master.conf
@@ -8,8 +8,6 @@ include ./schema/cosine.schema
 include ./schema/inetorgperson.schema
 include ./schema/openldap.schema
 #
-schemacheck	off
-#
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args
 
diff --git a/tests/data/slapd-repl-slave.conf b/tests/data/slapd-repl-slave.conf
index a38457f49ecb565ce5db8f990f9be7513e66b58f..28ab1289712d2e0270026fd6ebfbea780a293780 100644
--- a/tests/data/slapd-repl-slave.conf
+++ b/tests/data/slapd-repl-slave.conf
@@ -8,7 +8,6 @@ include ./schema/cosine.schema
 include ./schema/inetorgperson.schema
 include ./schema/openldap.schema
 #
-schemacheck	off
 pidfile     ./test-repl/slapd.pid
 argsfile    ./test-repl/slapd.args
 
diff --git a/tests/data/slapd-repl-submaster.conf b/tests/data/slapd-repl-submaster.conf
index 426dc49ab31f9630d0b1021a8de20d06114a87b8..699dedbcc9a0ca4003aa1088660eea9d6a153312 100644
--- a/tests/data/slapd-repl-submaster.conf
+++ b/tests/data/slapd-repl-submaster.conf
@@ -8,8 +8,6 @@ include ./schema/cosine.schema
 include ./schema/inetorgperson.schema
 include ./schema/openldap.schema
 #
-schemacheck	off
-#
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args
 
diff --git a/tests/data/slapd-repl-subslave.conf b/tests/data/slapd-repl-subslave.conf
index 1a094fe060dd99385474d04b6dd5231b3b7522de..79b2f80dbab105562cdc1b3b149102da36ee0cb4 100644
--- a/tests/data/slapd-repl-subslave.conf
+++ b/tests/data/slapd-repl-subslave.conf
@@ -8,7 +8,6 @@ include ./schema/cosine.schema
 include ./schema/inetorgperson.schema
 include ./schema/openldap.schema
 #
-schemacheck	off
 pidfile     ./test-repl/slapd.pid
 argsfile    ./test-repl/slapd.args
 
diff --git a/tests/data/slapd-schema.conf b/tests/data/slapd-schema.conf
index c4c8773e46afb83054b73cdaf29f194874a3dab1..38e500acccc0ef9d7ce6e9594bf6ff312b18550c 100644
--- a/tests/data/slapd-schema.conf
+++ b/tests/data/slapd-schema.conf
@@ -18,7 +18,6 @@ include ./schema/openldap.schema
 #
 include ./schema/collective.schema
 #
-schemacheck	on
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args
 
diff --git a/tests/data/slapd.conf b/tests/data/slapd.conf
index 868fc00e7338cbb31416979154f3ed5d7a6c7d4a..ce2f117d57854dbd2318e6309265b7c43b1cc994 100644
--- a/tests/data/slapd.conf
+++ b/tests/data/slapd.conf
@@ -8,7 +8,6 @@ include ./schema/core.schema
 include ./schema/cosine.schema
 include ./schema/inetorgperson.schema
 include ./schema/openldap.schema
-schemacheck	on
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args