diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf
index efdd7b3a42e3efb90fdd281b917046c131926b09..3307b6bd945f23a2d696104ae966d25fc2afb1b7 100644
--- a/tests/data/slapd-acl.conf
+++ b/tests/data/slapd-acl.conf
@@ -34,9 +34,11 @@ access		to *
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
-# ldbm database definitions
+# database definitions
 #######################################################################
 
 database	@BACKEND@
@@ -93,3 +95,5 @@ access		to filter="(name=X*Y*Z)"
 		by * continue
 
 # fall into global ACLs
+
+#monitor#database monitor
diff --git a/tests/data/slapd-cache-master.conf b/tests/data/slapd-cache-master.conf
index d4f08939fbc407e35f55ec94bcad9021efd0ad3a..746d75931f1b94fcf52fcd4192a86ada126da0f2 100644
--- a/tests/data/slapd-cache-master.conf
+++ b/tests/data/slapd-cache-master.conf
@@ -25,6 +25,8 @@ argsfile    ./testrun/slapd.1.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # database definitions
@@ -37,3 +39,5 @@ rootdn		"cn=Manager,dc=example,dc=com"
 rootpw		secret
 index		objectClass	eq
 index		cn,sn,uid	pres,eq,sub
+
+#monitor#database monitor
diff --git a/tests/data/slapd-dn.conf b/tests/data/slapd-dn.conf
index 2063e0985cb81f47c08787fad663ba451c453f16..f67ab8d75b20f06385b647ff56a6627013f74c06 100644
--- a/tests/data/slapd-dn.conf
+++ b/tests/data/slapd-dn.conf
@@ -25,6 +25,8 @@ argsfile    ./testrun/slapd.1.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # database definitions
@@ -38,3 +40,4 @@ rootpw		secret
 index		objectClass	eq
 index		cn,sn,uid	pres,eq,sub
 
+#monitor#database monitor
diff --git a/tests/data/slapd-dnssrv.conf b/tests/data/slapd-dnssrv.conf
index 84e409aa082635e2172b207c054bda067bdb04b5..a7b2bd0af0ba7dfb2652f8d14c13b971bd387b5b 100644
--- a/tests/data/slapd-dnssrv.conf
+++ b/tests/data/slapd-dnssrv.conf
@@ -23,10 +23,14 @@ sasl-secprops noanonymous
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
-# ldbm database definitions
+# database definitions
 #######################################################################
 
+#monitor#database monitor
+
 database	dnssrv
 suffix		""
diff --git a/tests/data/slapd-emptydn.conf b/tests/data/slapd-emptydn.conf
index 29c48030e570d75be91b04f8f8bb1945e0615c4d..5db18ba6040a924e5a6f68c677e9d1cf3f496609 100644
--- a/tests/data/slapd-emptydn.conf
+++ b/tests/data/slapd-emptydn.conf
@@ -31,6 +31,8 @@ access		to dn.exact="cn=Subschema"
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # database definitions
@@ -68,3 +70,4 @@ access		to attrs=userPassword
 access		to dn.subtree=""
 		by * read
 
+#monitor#database monitor
diff --git a/tests/data/slapd-glue.conf b/tests/data/slapd-glue.conf
index d62ad66e3d38f9748504c23ec71bcef0aa3418e0..546ad558a26d6c94f7746763664e85ee0aa8df44 100644
--- a/tests/data/slapd-glue.conf
+++ b/tests/data/slapd-glue.conf
@@ -24,8 +24,8 @@ argsfile    ./testrun/slapd.1.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
-
-#monitormod#moduleload ../servers/slapd/back-monitor/back_monitor.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # ldbm database definitions
diff --git a/tests/data/slapd-idassert.conf b/tests/data/slapd-idassert.conf
index e8d82ea3448c6a40f75f2daa89a8cc68c7fd3b06..f893618bfb8ba5bfad207b71248cefc12fda4a88 100644
--- a/tests/data/slapd-idassert.conf
+++ b/tests/data/slapd-idassert.conf
@@ -25,7 +25,10 @@ argsfile    ./testrun/slapd.1.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
-#ldapmod#moduleload ../servers/slapd/back-ldap/back_ldap.la
+#ldapmod#modulepath ../servers/slapd/back-ldap/
+#ldapmod#moduleload back_ldap.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # ldbm database definitions
@@ -116,4 +119,4 @@ access to *
 	by dn.exact="cn=Sandbox,ou=Admin,dc=example,dc=com" search
 	by * none
 
-
+#monitor#database monitor
diff --git a/tests/data/slapd-ldapglue.conf b/tests/data/slapd-ldapglue.conf
index 846ff41f39e9e928c08e6ce8784dfb15d22eb66f..4a300fed1bcab48b078f292b35323ae88da441d6 100644
--- a/tests/data/slapd-ldapglue.conf
+++ b/tests/data/slapd-ldapglue.conf
@@ -25,7 +25,10 @@ argsfile    ./testrun/slapd.1.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
-#ldapmod#moduleload ../servers/slapd/back-ldap/back_ldap.la
+#ldapmod#modulepath ../servers/slapd/back-ldap/
+#ldapmod#moduleload back_ldap.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # ldbm database definitions
@@ -78,3 +81,4 @@ rootpw		secret
 index		objectClass	eq
 index		cn,sn,uid	pres,eq,sub
 
+#monitor#database monitor
diff --git a/tests/data/slapd-ldapgluegroups.conf b/tests/data/slapd-ldapgluegroups.conf
index e6fba2debb9358b41a731297acf8959e1b09a2cd..2a24fffe7814f14c1e5e61e34e92a85b26e1accd 100644
--- a/tests/data/slapd-ldapgluegroups.conf
+++ b/tests/data/slapd-ldapgluegroups.conf
@@ -27,6 +27,8 @@ argsfile    ./testrun/slapd.3.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # ldbm database definitions
@@ -57,3 +59,4 @@ rootpw		secret
 index		objectClass	eq
 index		cn,sn,uid	pres,eq,sub
 
+#monitor#database monitor
diff --git a/tests/data/slapd-ldapgluepeople.conf b/tests/data/slapd-ldapgluepeople.conf
index 818b65e0159a68f62247e3a56c1b8899bc4c8ea9..b528aa589c3b4698ff8a38c7e991968ced66f25b 100644
--- a/tests/data/slapd-ldapgluepeople.conf
+++ b/tests/data/slapd-ldapgluepeople.conf
@@ -27,6 +27,8 @@ argsfile    ./testrun/slapd.2.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # ldbm database definitions
@@ -58,3 +60,4 @@ rootpw		secret
 index		objectClass	eq
 index		cn,sn,uid	pres,eq,sub
 
+#monitor#database monitor
diff --git a/tests/data/slapd-limits.conf b/tests/data/slapd-limits.conf
index e284f54942250ec98c197a0d85e787201c518d91..69b6debb52fd072fbe04c90bff71376b1e86c8fd 100644
--- a/tests/data/slapd-limits.conf
+++ b/tests/data/slapd-limits.conf
@@ -24,6 +24,8 @@ argsfile    ./testrun/slapd.1.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # ldbm database definitions
@@ -64,3 +66,5 @@ limits	dn.children="ou=Groups,dc=example,dc=com" size.soft=4
 limits	dn.subtree="ou=Admin,dc=example,dc=com" size.soft=3
 limits	users size.soft=2
 limits	anonymous size.soft=1
+
+#monitor#database monitor
diff --git a/tests/data/slapd-master.conf b/tests/data/slapd-master.conf
index 849bae6002c46a9a4ec93793356fe13575061d69..f3774834c57ad22967e826b305385d81f165a376 100644
--- a/tests/data/slapd-master.conf
+++ b/tests/data/slapd-master.conf
@@ -27,6 +27,8 @@ argsfile    ./testrun/slapd.1.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # ldbm database definitions
@@ -39,3 +41,5 @@ rootdn		"cn=Manager,dc=example,dc=com"
 rootpw		secret
 #ldbm#index		objectClass eq
 #bdb#index		objectClass eq
+
+#monitor#database monitor
diff --git a/tests/data/slapd-nis-master.conf b/tests/data/slapd-nis-master.conf
index 11d2e634a9c94121fe459f378a95c47747678247..3970c7ca94be7a916bc5e2c536b9358650bf44fb 100644
--- a/tests/data/slapd-nis-master.conf
+++ b/tests/data/slapd-nis-master.conf
@@ -25,6 +25,8 @@ argsfile    ./test-db/slapd.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # ldbm database definitions
@@ -50,3 +52,5 @@ index		ipHostNumber		pres,eq,approx
 index		ipNetworkNumber		pres,eq,approx
 index		ipProtocolNumber	pres,eq,approx
 index		default		none
+
+#monitor#database monitor
diff --git a/tests/data/slapd-passwd.conf b/tests/data/slapd-passwd.conf
index d88029700193e5043234098bf62d615fc55e8295..36f58593b28ffd8d0ca535f951178e1d23bdf55b 100644
--- a/tests/data/slapd-passwd.conf
+++ b/tests/data/slapd-passwd.conf
@@ -24,6 +24,8 @@ argsfile    ./test-db/slapd.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # ldbm database definitions
@@ -34,3 +36,5 @@ suffix		"dc=example,dc=com"
 rootdn		"cn=Manager,dc=example,dc=com"
 rootpw		secret
 #file		./data/passwd
+
+#monitor#database monitor
diff --git a/tests/data/slapd-ppolicy.conf b/tests/data/slapd-ppolicy.conf
index 2dde71d4086cdcfccb20fec134eaa4f89befe71b..e9b7b26c6c77b17fec14f4efcf0577318dec3280 100644
--- a/tests/data/slapd-ppolicy.conf
+++ b/tests/data/slapd-ppolicy.conf
@@ -24,7 +24,10 @@ argsfile    ./test-db/slapd.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
-#ppolicymod#moduleload ../servers/slapd/overlays/ppolicy.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
+#ppolicymod#modulepath ../servers/slapd/overlays/
+#ppolicymod#moduleload ppolicy.la
 
 #######################################################################
 # ldbm database definitions
@@ -47,3 +50,5 @@ access to attr=userpassword
 access to *
 	by self write
 	by * read
+
+#monitor#database monitor
diff --git a/tests/data/slapd-proxycache.conf b/tests/data/slapd-proxycache.conf
index 5336c36765f02e562b2053db5d7cfa4ce4db8381..045071cd19c5ba4e6fbb122b5228e3c5f3f2ae89 100644
--- a/tests/data/slapd-proxycache.conf
+++ b/tests/data/slapd-proxycache.conf
@@ -25,8 +25,12 @@ argsfile    ./testrun/slapd.2.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
-#ldapmod#moduleload	../servers/slapd/back-ldap/back_ldap.la
-#pcachemod#moduleload ../servers/slapd/overlays/pcache.la
+#ldapmod#modulepath	../servers/slapd/back-ldap/
+#ldapmod#moduleload	back_ldap.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
+#pcachemod#modulepath ../servers/slapd/overlays/
+#pcachemod#moduleload pcache.la
 
 #######################################################################
 # database definitions
@@ -50,3 +54,5 @@ cachesize 20
 directory ./testrun/db.2.a
 index		objectClass	eq
 index		cn,sn,uid,mail	pres,eq,sub
+
+#monitor#database monitor
diff --git a/tests/data/slapd-pw.conf b/tests/data/slapd-pw.conf
index f22feababc7cb27e9602d6257489e708f5124246..72b887fdb100ee3f66815b3bcd880e1d8fe7555f 100644
--- a/tests/data/slapd-pw.conf
+++ b/tests/data/slapd-pw.conf
@@ -26,6 +26,8 @@ argsfile    ./testrun/slapd.1.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # ldbm database definitions
@@ -52,3 +54,5 @@ access to attr=userpassword
 access to *
 	by self write
 	by * read
+
+#monitor#database monitor
diff --git a/tests/data/slapd-ref-slave.conf b/tests/data/slapd-ref-slave.conf
index 6e12082d3c7b01ee69a5b9c337d55bb0d637c27a..c62818b8f40a29bffcc552641c80f6139bde0073 100644
--- a/tests/data/slapd-ref-slave.conf
+++ b/tests/data/slapd-ref-slave.conf
@@ -25,6 +25,8 @@ argsfile    ./testrun/slapd.2.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # ldbm database definitions
@@ -42,3 +44,5 @@ rootpw		secret
 #ldbm#index		cn,sn,uid	pres,eq,sub
 #bdb#index		objectClass	eq
 #bdb#index		cn,sn,uid	pres,eq,sub
+
+#monitor#database monitor
diff --git a/tests/data/slapd-referrals.conf b/tests/data/slapd-referrals.conf
index bab229eaa1cbc03d701c44d6be6c8c1f10502192..a11c731a1bdcbd51abac51c62d9a921186cc7c86 100644
--- a/tests/data/slapd-referrals.conf
+++ b/tests/data/slapd-referrals.conf
@@ -24,6 +24,8 @@ argsfile    ./testrun/slapd.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # ldbm database definitions
@@ -36,3 +38,5 @@ rootdn		"cn=Manager,c=us"
 rootpw		secret
 #ldbm#index		objectClass eq
 #bdb#index		objectClass eq
+
+#monitor#database monitor
diff --git a/tests/data/slapd-refint.conf b/tests/data/slapd-refint.conf
index 728405c485a8766abab45633aa946cf385f61682..bd6b8f9b5c3cd505e11537aa6b89e6ebaff02d47 100644
--- a/tests/data/slapd-refint.conf
+++ b/tests/data/slapd-refint.conf
@@ -25,6 +25,8 @@ argsfile    ./testrun/slapd.1.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 #refintmod#modulepath	../servers/slapd/overlays/
 #refintmod#moduleload refint.la
 
@@ -43,3 +45,4 @@ index		cn,sn,uid	pres,eq,sub
 overlay		refint
 refint_attributes	manager secretary member
 
+#monitor#database monitor
diff --git a/tests/data/slapd-relay.conf b/tests/data/slapd-relay.conf
index 77b5bc1b0e1d2fdc9b931580e7e478388a23218f..5dfeaaeb74944cae40b43f882528c12deb45a7da 100644
--- a/tests/data/slapd-relay.conf
+++ b/tests/data/slapd-relay.conf
@@ -24,7 +24,10 @@ argsfile    ./test-db/slapd.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
-#rwmmod#moduleload ../servers/slapd/overlays/rwm.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
+#rwmmod#modulepath ../servers/slapd/overlays/
+#rwmmod#moduleload rwm.la
 
 #######################################################################
 # ldbm database definitions
@@ -49,3 +52,4 @@ database	relay
 suffix		"o=Beispiel,c=DE"
 relay		"dc=example,dc=com" massage
 
+#monitor#database monitor
diff --git a/tests/data/slapd-repl-master.conf b/tests/data/slapd-repl-master.conf
index b8e5059326a8f08b959bc1cbd36c21ded2f025f1..6278fc306ba04b4bf03305d0801450dbefedefea 100644
--- a/tests/data/slapd-repl-master.conf
+++ b/tests/data/slapd-repl-master.conf
@@ -25,6 +25,8 @@ argsfile    ./testrun/slapd.1.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # ldbm database definitions
@@ -47,3 +49,5 @@ replica		host=localhost:@PORT2@
 		binddn="cn=Replica,dc=example,dc=com"
 		bindmethod=simple
 		credentials=secret
+
+#monitor#database monitor
diff --git a/tests/data/slapd-repl-slave.conf b/tests/data/slapd-repl-slave.conf
index 83130205ab392a9c2ecb146fd7337c53357a46c2..616d0144be5d9d8cb52b7cae639c6a6cb0788ca4 100644
--- a/tests/data/slapd-repl-slave.conf
+++ b/tests/data/slapd-repl-slave.conf
@@ -25,6 +25,8 @@ argsfile    ./testrun/slapd.2.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # ldbm database definitions
@@ -42,3 +44,5 @@ updateref	"ldap://localhost:9010"
 #ldbm#index		cn,sn,uid	pres,eq,sub
 #bdb#index		objectClass	eq
 #bdb#index		cn,sn,uid	pres,eq,sub
+
+#monitor#database monitor
diff --git a/tests/data/slapd-schema.conf b/tests/data/slapd-schema.conf
index c392753ec372e53514b982451d8c499f5e4ff96c..adeb0dea21f0417ba39d226e0ceb03005d50ca94 100644
--- a/tests/data/slapd-schema.conf
+++ b/tests/data/slapd-schema.conf
@@ -33,8 +33,8 @@ rootdse 	./testdata/rootdse.ldif
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
-
-#monitormod#moduleload ../servers/slapd/back-monitor/back_monitor.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # ldbm database definitions
diff --git a/tests/data/slapd-syncrepl-master.conf b/tests/data/slapd-syncrepl-master.conf
index 5528ee883ff4fd9931ee2e47ddca6fdc4e31ee68..d7cad13cb815b1d5de966152419fdc3d4c619968 100644
--- a/tests/data/slapd-syncrepl-master.conf
+++ b/tests/data/slapd-syncrepl-master.conf
@@ -25,6 +25,8 @@ argsfile    ./testrun/slapd.1.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # master database definitions
@@ -41,3 +43,5 @@ rootpw		secret
 #bdb#index		cn,sn,uid	pres,eq,sub
 
 sessionlog 1 100
+
+#monitor#database monitor
diff --git a/tests/data/slapd-syncrepl-slave-persist1.conf b/tests/data/slapd-syncrepl-slave-persist1.conf
index 4ac6c7510d005ba7db1ed8dc35552b2ada411649..ae85b12f7283d91d91674d5466cd4b752a9bfe59 100644
--- a/tests/data/slapd-syncrepl-slave-persist1.conf
+++ b/tests/data/slapd-syncrepl-slave-persist1.conf
@@ -25,6 +25,8 @@ argsfile    ./testrun/slapd.4.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # consumer database definitions
@@ -53,3 +55,5 @@ syncrepl rid=1
 		 schemachecking=off
 		 scope=sub
 		 type=refreshAndPersist
+
+#monitor#database monitor
diff --git a/tests/data/slapd-syncrepl-slave-persist2.conf b/tests/data/slapd-syncrepl-slave-persist2.conf
index 0ce38a380fca7c66ca3ee25b9787d837b053d63b..e305807604b71e3cd59493e4088d1a7de1e57c45 100644
--- a/tests/data/slapd-syncrepl-slave-persist2.conf
+++ b/tests/data/slapd-syncrepl-slave-persist2.conf
@@ -13,6 +13,8 @@ argsfile    ./testrun/slapd.5.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # consumer database definitions
@@ -41,3 +43,5 @@ syncrepl rid=1
 		 schemachecking=off
 		 scope=sub
 		 type=refreshAndPersist
+
+#monitor#database monitor
diff --git a/tests/data/slapd-syncrepl-slave-persist3.conf b/tests/data/slapd-syncrepl-slave-persist3.conf
index 4c1bdb557a2e37dac787ff7fa4afc0c87887c97b..2333a81f1ba1e33da891df9c9a26dd30ee674e76 100644
--- a/tests/data/slapd-syncrepl-slave-persist3.conf
+++ b/tests/data/slapd-syncrepl-slave-persist3.conf
@@ -25,6 +25,8 @@ argsfile    ./testrun/slapd.6.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # consumer database definitions
@@ -53,3 +55,5 @@ syncrepl rid=1
 		 schemachecking=off
 		 scope=sub
 		 type=refreshAndPersist
+
+#monitor#database monitor
diff --git a/tests/data/slapd-syncrepl-slave-refresh1.conf b/tests/data/slapd-syncrepl-slave-refresh1.conf
index e7f8cb0eaabbfb839b7abb36dec4f01868e15ef9..7da866c045675f5fbe826e27ab7965c4819099ef 100644
--- a/tests/data/slapd-syncrepl-slave-refresh1.conf
+++ b/tests/data/slapd-syncrepl-slave-refresh1.conf
@@ -25,6 +25,8 @@ argsfile    ./testrun/slapd.2.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # consumer database definitions
@@ -56,3 +58,5 @@ syncrepl rid=1
 		 scope=sub
 		 type=refreshOnly
 		 interval=00:00:00:10
+
+#monitor#database monitor
diff --git a/tests/data/slapd-syncrepl-slave-refresh2.conf b/tests/data/slapd-syncrepl-slave-refresh2.conf
index 5edd50a3833ddb07c6d64d3022f07295ba0b8d88..057ba197886df9b51a7957f8a1f36f43cb12ef94 100644
--- a/tests/data/slapd-syncrepl-slave-refresh2.conf
+++ b/tests/data/slapd-syncrepl-slave-refresh2.conf
@@ -25,6 +25,8 @@ argsfile    ./testrun/slapd.3.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # consumer database definitions
@@ -54,3 +56,5 @@ syncrepl rid=1
 		 scope=sub
 		 type=refreshOnly
 		 interval=00:00:00:10
+
+#monitor#database monitor
diff --git a/tests/data/slapd-unique.conf b/tests/data/slapd-unique.conf
index 00e255ec0e63410d9abb38615b0ea03cfaf7fe2b..d63f5f7084e0189e3351582c8d6b5281c46cc1ac 100644
--- a/tests/data/slapd-unique.conf
+++ b/tests/data/slapd-unique.conf
@@ -25,6 +25,8 @@ argsfile    ./testrun/slapd.1.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 #uniquemod#modulepath	../servers/slapd/overlays
 #uniquemod#moduleload unique.la
 
@@ -43,3 +45,5 @@ index		cn,sn,uid	pres,eq,sub
 overlay			unique
 unique_ignore		o cn sn ou objectClass
 unique_attributes	employeeNumber
+
+#monitor#database monitor
diff --git a/tests/data/slapd-whoami.conf b/tests/data/slapd-whoami.conf
index c53a87e456fcad7c7ea4f623fa0d04108f78e6a2..ce59f08dda76cbd2aa688cf932055115dcadc638 100644
--- a/tests/data/slapd-whoami.conf
+++ b/tests/data/slapd-whoami.conf
@@ -26,6 +26,8 @@ argsfile    ./testrun/slapd.1.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # ldbm database definitions
@@ -60,3 +62,4 @@ rootpw		secret
 index		objectClass	eq
 index		cn,sn,uid	pres,eq,sub
 
+#monitor#database monitor
diff --git a/tests/data/slapd.conf b/tests/data/slapd.conf
index 7e215cf01820d190cae8d580c084f1e52533be79..5c99d08fad505820a950d79d37814ff772cf620b 100644
--- a/tests/data/slapd.conf
+++ b/tests/data/slapd.conf
@@ -25,6 +25,8 @@ argsfile    ./testrun/slapd.1.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # database definitions
@@ -38,3 +40,4 @@ rootpw		secret
 index		objectClass	eq
 index		cn,sn,uid	pres,eq,sub
 
+#monitor#database monitor
diff --git a/tests/data/slapd2.conf b/tests/data/slapd2.conf
index 414abefba9eb81f0eb755b53bc7631eadcfaa871..90df2ada70ef0d81b8a149cdf1fdc035ec572c11 100644
--- a/tests/data/slapd2.conf
+++ b/tests/data/slapd2.conf
@@ -25,6 +25,8 @@ argsfile    ./testrun/slapd.2.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
+#monitormod#modulepath ../servers/slapd/back-monitor/
+#monitormod#moduleload back_monitor.la
 
 #######################################################################
 # database definitions
@@ -37,3 +39,5 @@ rootdn		"cn=Manager,dc=example,dc=com"
 rootpw		secret
 index		objectClass	eq
 index		cn,sn,uid	pres,eq,sub
+
+#monitor#database monitor