4 files changed, 16 insertions, 8 deletions
diff --git a/source4/lib/ldb/tests/test-extended.sh b/source4/lib/ldb/tests/test-extended.sh
index 0bcb3ebcaa..c3958cf01c 100755
--- a/source4/lib/ldb/tests/test-extended.sh
+++ b/source4/lib/ldb/tests/test-extended.sh
@@ -2,7 +2,7 @@
 
 echo "Running extended search tests"
 
-rm -f $LDB_URL
+mv $LDB_URL $LDB_URL.1
 
 cat <<EOF | bin/ldbadd || exit 1
 dn: cn=testrec1,cn=TEST
@@ -67,4 +67,3 @@ checkcount 1 '(i1:1.2.840.113556.1.4.804:=8388608)'
 # this is one that w2k gives
 checkcount 3 '(|(|(&(!(groupType:1.2.840.113556.1.4.803:=1))(groupType:1.2.840.113556.1.4.803:=2147483648)(groupType:1.2.840.113556.1.4.804:=10))(samAccountType=805306368))(samAccountType=805306369))'
 
-rm -f $LDB_URL
diff --git a/source4/lib/ldb/tests/test-ldap.sh b/source4/lib/ldb/tests/test-ldap.sh
index 4fcd328cad..d9fa73b641 100755
--- a/source4/lib/ldb/tests/test-ldap.sh
+++ b/source4/lib/ldb/tests/test-ldap.sh
@@ -24,9 +24,17 @@ for f in $SCHEMA_NEEDED; do
     fi
 done
 
-tests/init_slapd.sh
-tests/start_slapd.sh
-
 export LDB_URL=`tests/ldapi_url.sh`
 
-. tests/test-generic.sh
+PATH=bin:$PATH
+export PATH
+
+if [ -z "$LDBDIR" ]; then
+    LDBDIR="."
+    export LDBDIR
+fi
+
+. $LDBDIR/tests/init_slapd.sh
+. $LDBDIR/tests/start_slapd.sh
+
+. $LDBDIR/tests/test-generic.sh
diff --git a/source4/lib/ldb/tests/test-tdb-features.sh b/source4/lib/ldb/tests/test-tdb-features.sh
index a78d2d3dd5..613afef8ad 100644
--- a/source4/lib/ldb/tests/test-tdb-features.sh
+++ b/source4/lib/ldb/tests/test-tdb-features.sh
@@ -2,7 +2,7 @@
 
 echo "Running tdb feature tests"
 
-rm -f $LDB_URL
+mv $LDB_URL $LDB_URL.2
 
 checkcount() {
     count=$1
@@ -128,4 +128,3 @@ checkcount 1 '(test=foo)'
 checkcount 0 '(test=FOO)'
 checkcount 0 '(test=fo*)'
 
-rm -f $LDB_URL
diff --git a/source4/lib/ldb/tests/test-tdb.sh b/source4/lib/ldb/tests/test-tdb.sh
index 3d461b0b3f..936c448757 100755
--- a/source4/lib/ldb/tests/test-tdb.sh
+++ b/source4/lib/ldb/tests/test-tdb.sh
@@ -7,6 +7,8 @@ PATH=bin:$PATH
 export PATH
 
 rm -f tdbtest.ldb
+rm -f tdbtest.ldb.1
+rm -f tdbtest.ldb.2
 
 if [ -z "$LDBDIR" ]; then
     LDBDIR="."