diff --git a/tests/server/openldap/data/04-z_labeleduri.ldif b/tests/server/openldap/data/04-z_labeleduri.ldif
index bbd7c35b..0b2e10c1 100644
--- a/tests/server/openldap/data/04-z_labeleduri.ldif
+++ b/tests/server/openldap/data/04-z_labeleduri.ldif
@@ -1,7 +1,6 @@
 
 dn: cn=tech_staff,dc=example.com
 cn: tech_staff
-labeleduri: ldap:///ou=People,o=Simpsons?uid?one?(&(sn=Simpson)(|(uidNumber
- =1000)(uidNumber=1001)))
+labeleduri: ldap:///dc=example.com?uid?one?(|(cn=kerberos)(uidNumber=*))
 objectclass: nisMailAlias
 objectclass: labeledURIObject
diff --git a/tests/server/openldap/schema/modify/00-config.ldif b/tests/server/openldap/schema/modify/00-config.ldif
new file mode 100644
index 00000000..b8e6cc78
--- /dev/null
+++ b/tests/server/openldap/schema/modify/00-config.ldif
@@ -0,0 +1,7 @@
+dn: olcDatabase={0}config,cn=config
+changetype: modify
+add: olcRootPW
+olcRootPW:: c2VjcmV0
+
+add: olcRootDN
+olcRootDN: cn=config
diff --git a/tests/server/openldap/schema/modify/00-mapsize.ldif b/tests/server/openldap/schema/modify/00-mapsize.ldif
new file mode 100644
index 00000000..e1b338cb
--- /dev/null
+++ b/tests/server/openldap/schema/modify/00-mapsize.ldif
@@ -0,0 +1,25 @@
+dn: olcDatabase={3}mdb,cn=config
+changetype: modify
+add: olcDbMaxSize
+olcDbMaxSize: 1073741824
+
+dn: olcDatabase={4}mdb,cn=config
+changetype: modify
+add: olcDbMaxSize
+olcDbMaxSize: 1073741824
+
+dn: olcDatabase={5}mdb,cn=config
+changetype: modify
+add: olcDbMaxSize
+olcDbMaxSize: 1073741824
+
+dn: olcDatabase={6}mdb,cn=config
+changetype: modify
+add: olcDbMaxSize
+olcDbMaxSize: 1073741824
+
+dn: olcDatabase={7}mdb,cn=config
+changetype: modify
+add: olcDbMaxSize
+olcDbMaxSize: 1073741824
+
diff --git a/tests/server/openldap/schema/modify/00-sizelimit.ldif b/tests/server/openldap/schema/modify/00-sizelimit.ldif
new file mode 100644
index 00000000..d1684273
--- /dev/null
+++ b/tests/server/openldap/schema/modify/00-sizelimit.ldif
@@ -0,0 +1,4 @@
+dn: olcDatabase={4}mdb,cn=config
+changetype: modify
+add: olcSizeLimit
+olcSizeLimit: 2000
diff --git a/tests/server/openldap/schema/modify/40-dynlist-options.ldif b/tests/server/openldap/schema/modify/40-dynlist-options.ldif
new file mode 100644
index 00000000..59b35cca
--- /dev/null
+++ b/tests/server/openldap/schema/modify/40-dynlist-options.ldif
@@ -0,0 +1,11 @@
+dn: olcOverlay=dynlist,olcDatabase={4}mdb,cn=config
+changetype: add
+objectClass: olcOverlayConfig
+objectClass: olcDynListConfig
+olcOverlay: dynlist
+olcDynListAttrSet: nisMailAlias labeledURI
+#olcDynListAttrSet: groupOfURLs memberURL memberOf
+#olcDynListAttrSet: groupOfURLs memberURL member+dgMemberOf
+#olcDynListAttrSet: groupOfURLs memberURL member
+#olcDynListAttrSet: groupOfURLs memberURL member
+#olcDynListAttrSet: groupOfURLs labeledURI member