diff --git a/source4/selftest/Samba4.pm b/source4/selftest/Samba4.pm
index 34fe0a03f28..6882539dc87 100644
--- a/source4/selftest/Samba4.pm
+++ b/source4/selftest/Samba4.pm
@@ -435,11 +435,10 @@ moduleload	syncprov
 	}
 
 	system("slaptest -u -f $slapd_conf") == 0 or die("slaptest still fails after adding modules");
-	system("slapadd -b $basedn -f $slapd_conf -l $privatedir/$dnsname.ldif >/dev/null") == 0 or die("slapadd failed");
 	system("slapadd -b cn=Configuration,$basedn -f $slapd_conf -l $privatedir/$dnsname-config.ldif >/dev/null") == 0 or die("slapadd failed");
 	system("slapadd -b cn=Schema,cn=Configuration,$basedn -f $slapd_conf -l $privatedir/$dnsname-schema.ldif >/dev/null") == 0 or die("slapadd failed");
 
-    system("slaptest -f $slapd_conf >/dev/null") == 0 or 
+    system("slaptest -u -f $slapd_conf >/dev/null") == 0 or 
 		die ("slaptest after database load failed");
     
 	$ENV{PATH} = $oldpath;