diff --git a/tests/ldap/Makefile.am b/tests/ldap/Makefile.am
index afd528bf8..cbc0b7d8d 100644
--- a/tests/ldap/Makefile.am
+++ b/tests/ldap/Makefile.am
@@ -10,7 +10,9 @@ TESTS = check-ldap
 
 port = 49188
 
-do_subst = sed -e 's,[@]srcdir[@],$(srcdir),g' \
+do_subst = sed \
+	-e 's,[@]env_setup[@],$(top_builddir)/tests/bin/setup-env,g' \
+	-e 's,[@]srcdir[@],$(srcdir),g' \
 	-e 's,[@]port[@],$(port),g' \
 	-e 's,[@]objdir[@],$(top_builddir)/tests/ldap,g' \
 	-e 's,[@]EGREP[@],$(EGREP),g' 
diff --git a/tests/ldap/check-ldap.in b/tests/ldap/check-ldap.in
index efe94a022..3325c5d50 100644
--- a/tests/ldap/check-ldap.in
+++ b/tests/ldap/check-ldap.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2006 - 2007 Kungliga Tekniska Högskolan
+# Copyright (c) 2006 - 2016 Kungliga Tekniska Högskolan
 # (Royal Institute of Technology, Stockholm, Sweden). 
 # All rights reserved. 
 #
@@ -34,8 +34,12 @@
 # $Id$
 #
 
+env_setup="@env_setup@"
 srcdir="@srcdir@"
 objdir="@objdir@"
+
+. ${env_setup}
+
 EGREP="@EGREP@"
 
 R=TEST.H5L.SE
diff --git a/tests/ldap/slapd.conf b/tests/ldap/slapd.conf
index 077727e21..df76e82eb 100644
--- a/tests/ldap/slapd.conf
+++ b/tests/ldap/slapd.conf
@@ -20,8 +20,7 @@ include modules.conf
 
 defaultsearchbase "ou=TEST,dc=H5L,dc=SE"
 
-backend		bdb
-database        bdb
+database	bdb
 suffix		"o=TEST,dc=H5L,dc=SE"
 directory	db
 index           objectClass eq