diff --git a/tests/ldap/krb5.conf.in b/tests/ldap/krb5.conf.in
index fd0df064d..e5f1a1791 100644
--- a/tests/ldap/krb5.conf.in
+++ b/tests/ldap/krb5.conf.in
@@ -12,7 +12,7 @@
 
 [kdc]
 	database = {
-		dbname = ldapi://ldap-socket:OU=KerberosPrincipals,o=test,DC=h5l,DC=se
+		dbname = ldapi://.%2Fldap-socket:OU=KerberosPrincipals,o=test,DC=h5l,DC=se
 		realm = TEST.H5L.SE
 		mkey_file = @objdir@/mkey.file
                 log_file = @objdir@/log.current-db.log
diff --git a/tests/ldap/slapd-init.in b/tests/ldap/slapd-init.in
index f25dce08c..a3975aa67 100644
--- a/tests/ldap/slapd-init.in
+++ b/tests/ldap/slapd-init.in
@@ -7,7 +7,7 @@ rm -rf db schema
 mkdir db
 
 # kill of old slapd if running
-sh ${srcdir}/slapd-stop > /dev/null
+sh "${srcdir}/slapd-stop" > /dev/null
 
 SCHEMA_NEEDED="hdb core nis cosine inetorgperson openldap samba"
 
@@ -31,9 +31,18 @@ done
 
 touch modules.conf || exit 1
 
-slapadd -d 0 -f ${srcdir}/slapd.conf < ${srcdir}/init.ldif || exit 0
+if ! slapadd -d 0 -f "${srcdir}/slapd.conf" < "${srcdir}/init.ldif"; then
+    echo "moduleload back_bdb.la"   >> modules.conf
+    if ! slapadd -d 0 -f "${srcdir}/slapd.conf" < "${srcdir}/init.ldif"; then
+        echo "modulepath /usr/lib/ldap"  > modules.conf
+        echo "moduleload back_bdb.la"   >> modules.conf
+        slapadd -d 0 -f "${srcdir}/slapd.conf" < "${srcdir}/init.ldif" || exit 1
+    fi
+fi
+
+cp "`which slapd`" . || true # fails if running
 
 echo "starting slapd"
-slapd -d0 -f ${srcdir}/slapd.conf -h ldapi://.%2Fldap-socket &
+./slapd -d0 -f "${srcdir}/slapd.conf" -h ldapi://.%2Fldap-socket &
 
 sleep 4