diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd
index 6cada5e4320810cf603e0484636efdcabf4b0b67..dcff3dc9587b060e69c5d12ddfe9be775551d8ee 100755
--- a/tests/scripts/test001-slapadd
+++ b/tests/scripts/test001-slapadd
@@ -21,7 +21,7 @@ echo "Cleaning up in $DBDIR..."
 rm -f $DBDIR/[!C]*
 
 echo "Running slapadd to build slapd database..."
-$SLAPADD -f $CONF -l $LDIF
+$SLAPADD -f $CONF -l $LDIFORDERED
 RC=$?
 if test $RC != 0 ; then
 	echo "slapadd failed ($RC)!"
diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search
index dadad8a17968bbb97e7613ae614e174551708b5b..adde681a3793f2b04dc0f3078b53479248422345 100755
--- a/tests/scripts/test003-search
+++ b/tests/scripts/test003-search
@@ -18,7 +18,7 @@ echo "Cleaning up in $DBDIR..."
 rm -f $DBDIR/[!C]*
 
 echo "Running slapadd to build slapd database..."
-$SLAPADD -f $MCONF -l $LDIF
+$SLAPADD -f $MCONF -l $LDIFORDERED
 RC=$?
 if test $RC != 0 ; then
 	echo "slapadd failed ($RC)!"
diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify
index 6bd4e9e7d4b3cd210ed76ba3c8462fe00ab3ebf0..bf47eebbb75495a4fc7b1c6f3d0023f322af1f04 100755
--- a/tests/scripts/test004-modify
+++ b/tests/scripts/test004-modify
@@ -18,7 +18,7 @@ echo "Cleaning up in $DBDIR..."
 rm -f $DBDIR/[!C]*
 
 echo "Running slapadd to build slapd database..."
-$SLAPADD -f $CONF -l $LDIF
+$SLAPADD -f $CONF -l $LDIFORDERED
 RC=$?
 if test $RC != 0 ; then
 	echo "slapadd failed ($RC)!"
diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn
index 9029a1c2976d654642426e46ae69af14b3cf4fda..ff03ffb98204e2dab2166f43b91d9818a43e3ca0 100755
--- a/tests/scripts/test005-modrdn
+++ b/tests/scripts/test005-modrdn
@@ -18,7 +18,7 @@ echo "Cleaning up in $DBDIR..."
 rm -f $DBDIR/[!C]*
 
 echo "Running slapadd to build slapd database..."
-$SLAPADD -f $CONF -l $LDIF
+$SLAPADD -f $CONF -l $LDIFORDERED
 RC=$?
 if test $RC != 0 ; then
 	echo "slapadd failed ($RC)!"
diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls
index 6c0b1a0dcdf498bed35fb0364347d068f4f4ad33..5ebb19e016a5b4d5fde05ccf58e969bf91093911 100755
--- a/tests/scripts/test006-acls
+++ b/tests/scripts/test006-acls
@@ -18,7 +18,7 @@ echo "Cleaning up in $DBDIR..."
 rm -f $DBDIR/[!C]*
 
 echo "Running slapadd to build slapd database..."
-$SLAPADD -f $CONF -l $LDIF
+$SLAPADD -f $CONF -l $LDIFORDERED
 RC=$?
 if test $RC != 0 ; then
 	echo "slapadd failed ($RC)!"
diff --git a/tests/scripts/test008-concurrency b/tests/scripts/test008-concurrency
index ec93723ad2a0de83061b93b401a5580198add368..eadf72c7cb23231e969fafca18b7b24f8cc83525 100755
--- a/tests/scripts/test008-concurrency
+++ b/tests/scripts/test008-concurrency
@@ -21,7 +21,7 @@ echo "Cleaning up in $DBDIR..."
 rm -f $DBDIR/[!C]*
 
 echo "Running slapadd to build slapd database..."
-$SLAPADD -f $CONF -l $LDIF
+$SLAPADD -f $CONF -l $LDIFORDERED
 RC=$?
 if test $RC != 0 ; then
 	echo "slapadd failed ($RC)!"
diff --git a/tests/scripts/test009-referral b/tests/scripts/test009-referral
index e6f650a266d09789e7a6f43ef0b1a4096c6952d5..d584a196040d1ca577ab36c1fed82bb0e6c7e872 100755
--- a/tests/scripts/test009-referral
+++ b/tests/scripts/test009-referral
@@ -23,7 +23,7 @@ rm -f $DBDIR/[!C]*
 rm -f $REPLDIR/[!C]*
 
 echo "Running slapadd to build slapd database..."
-$SLAPADD -f $CONF -l $LDIF
+$SLAPADD -f $CONF -l $LDIFORDERED
 RC=$?
 if test $RC != 0 ; then
 	echo "slapadd failed ($RC)!"