diff --git a/tests/data/slapd-syncrepl-master.conf b/tests/data/slapd-syncrepl-master.conf
index d1e2f513488e1620f4f9e5955ce132172645ab8e..b4e93e47f0456d5e495a902f7532a04f5a7fd387 100644
--- a/tests/data/slapd-syncrepl-master.conf
+++ b/tests/data/slapd-syncrepl-master.conf
@@ -43,8 +43,9 @@ rootpw		secret
 #ldbm#index		cn,sn,uid	pres,eq,sub
 #bdb#index		objectClass	eq
 #bdb#index		cn,sn,uid	pres,eq,sub
+#bdb#index		entryUUID,entryCSN	eq
 
-#sessionlog 1 100
 overlay syncprov
+#syncprov-sessionlog 100
 
 #monitor#database monitor
diff --git a/tests/data/slapd-syncrepl-slave-persist1.conf b/tests/data/slapd-syncrepl-slave-persist1.conf
index bb09f523423975e2b5c7efd5b2fea1103b709c9b..239b48906007369066f1fe14601d7d3e50f1a6eb 100644
--- a/tests/data/slapd-syncrepl-slave-persist1.conf
+++ b/tests/data/slapd-syncrepl-slave-persist1.conf
@@ -47,7 +47,6 @@ rootpw		secret
 # Don't change syncrepl spec yet
 syncrepl rid=1
 		 provider=@URI1@
-		 updatedn="cn=Replica,dc=example,dc=com"
 		 binddn="cn=Manager,dc=example,dc=com"
 		 bindmethod=simple
 		 credentials=secret
diff --git a/tests/data/slapd-syncrepl-slave-persist2.conf b/tests/data/slapd-syncrepl-slave-persist2.conf
index e305807604b71e3cd59493e4088d1a7de1e57c45..1f3f47c93507c5e91cffb5212d3534d97d31e0a4 100644
--- a/tests/data/slapd-syncrepl-slave-persist2.conf
+++ b/tests/data/slapd-syncrepl-slave-persist2.conf
@@ -29,11 +29,11 @@ rootpw		secret
 #ldbm#index		cn,sn,uid	pres,eq,sub
 #bdb#index		objectClass	eq
 #bdb#index		cn,sn,uid	pres,eq,sub
+#bdb#index		entryUUID,entryCSN	eq
 
 # Don't change syncrepl spec yet
 syncrepl rid=1
 		 provider=@URI4@
-		 updatedn="cn=Replica,dc=example,dc=com"
 		 binddn="cn=Replica,dc=example,dc=com"
 		 bindmethod=simple
 		 credentials=secret
diff --git a/tests/data/slapd-syncrepl-slave-persist3.conf b/tests/data/slapd-syncrepl-slave-persist3.conf
index af865f0476fddb254d3ec895ecb506ff48c0d70f..cb4576cc24300f2bc5c072bbf82d9c75852a9a54 100644
--- a/tests/data/slapd-syncrepl-slave-persist3.conf
+++ b/tests/data/slapd-syncrepl-slave-persist3.conf
@@ -41,11 +41,11 @@ rootpw		secret
 #ldbm#index		cn,sn,uid	pres,eq,sub
 #bdb#index		objectClass	eq
 #bdb#index		cn,sn,uid	pres,eq,sub
+#bdb#index		entryUUID,entryCSN	eq
 
 # Don't change syncrepl spec yet
 syncrepl rid=1
 		 provider=@URI1@
-		 updatedn="cn=Replica,dc=example,dc=com"
 		 binddn="cn=Manager,dc=example,dc=com"
 		 bindmethod=simple
 		 credentials=secret
diff --git a/tests/data/slapd-syncrepl-slave-refresh1.conf b/tests/data/slapd-syncrepl-slave-refresh1.conf
index ac766d841abf01206bff9d7793093b7cb4e2c7b6..b5873c5bd226e6f77ad62c5b67cfcd3236be45b3 100644
--- a/tests/data/slapd-syncrepl-slave-refresh1.conf
+++ b/tests/data/slapd-syncrepl-slave-refresh1.conf
@@ -41,15 +41,14 @@ rootdn		"cn=Replica,dc=example,dc=com"
 rootpw		secret
 #ldbm#index		objectClass	eq
 #ldbm#index		cn,sn,uid	pres,eq,sub
+#ldbm#index		entryUUID	eq
 #bdb#index		objectClass	eq
 #bdb#index		cn,sn,uid	pres,eq,sub
-
-sessionlog 1 100
+#bdb#index		entryUUID,entryCSN	eq
 
 # Don't change syncrepl spec yet
 syncrepl rid=1
 		 provider=@URI1@
-		 updatedn="cn=Replica,dc=example,dc=com"
 		 binddn="cn=Manager,dc=example,dc=com"
 		 bindmethod=simple
 		 credentials=secret
@@ -62,6 +61,8 @@ syncrepl rid=1
 		 interval=00:00:00:10
 
 overlay syncprov
+syncprov-sessionlog 100
+
 
 
 #monitor#database monitor
diff --git a/tests/data/slapd-syncrepl-slave-refresh2.conf b/tests/data/slapd-syncrepl-slave-refresh2.conf
index b43c8368d8d1627559997af504d17cdb493ea48e..780d2fde9a5b82bb1abe6ccf1a9efc66ca144691 100644
--- a/tests/data/slapd-syncrepl-slave-refresh2.conf
+++ b/tests/data/slapd-syncrepl-slave-refresh2.conf
@@ -39,13 +39,14 @@ rootdn		"cn=Replica,dc=example,dc=com"
 rootpw		secret
 #ldbm#index		objectClass	eq
 #ldbm#index		cn,sn,uid	pres,eq,sub
+#ldbm#index		entryUUID	eq
 #bdb#index		objectClass	eq
 #bdb#index		cn,sn,uid	pres,eq,sub
+#bdb#index		entryUUID,entryCSN	eq
 
 # Don't change syncrepl spec yet
 syncrepl rid=1
 		 provider=@URI2@
-		 updatedn="cn=Replica,dc=example,dc=com"
 		 binddn="cn=Replica,dc=example,dc=com"
 		 bindmethod=simple
 		 credentials=secret