diff --git a/tests/data/emptydn.out b/tests/data/emptydn.out
index 608c92dcefa439bee20a56fc94cc56c741e42999..3bb9f92ec92f3758cdbaed67defc9cb4a4610253 100644
--- a/tests/data/emptydn.out
+++ b/tests/data/emptydn.out
@@ -1,28 +1,28 @@
-dn: c=US
-objectClass: country
-c: US
-
-dn: o=Example,c=US
+dn: o=Esempio,c=IT
 objectClass: organization
+o: Esempio
+o: Esempio S.p.A.
 o: Example
-o: Example, Inc.
-
-dn: c=UK
-objectClass: country
-c: UK
 
 dn: o=Example,c=UK
 objectClass: organization
 o: Example
 o: Example, Ltd.
 
+dn: o=Example,c=US
+objectClass: organization
+o: Example
+o: Example, Inc.
+
 dn: c=IT
 objectClass: country
 c: IT
 
-dn: o=Esempio,c=IT
-objectClass: organization
-o: Esempio
-o: Esempio S.p.A.
-o: Example
+dn: c=UK
+objectClass: country
+c: UK
+
+dn: c=US
+objectClass: country
+c: US
 
diff --git a/tests/data/emptydn.out.slapadd b/tests/data/emptydn.out.slapadd
index 8a65c0f621c2abc920e06eb52512fd030031e432..a0afec8d88c43a382c998080f9a2c956d820170b 100644
--- a/tests/data/emptydn.out.slapadd
+++ b/tests/data/emptydn.out.slapadd
@@ -1,38 +1,38 @@
-dn: c=US
-objectClass: country
-c: US
-
-dn: o=Example,c=US
+dn: o=Beispiel,c=DE
 objectClass: organization
+o: Beispiel
+o: Beispiel GmbH
 o: Example
-o: Example, Inc.
 
-dn: c=UK
+dn: c=DE
 objectClass: country
-c: UK
+c: DE
+
+dn: o=Esempio,c=IT
+objectClass: organization
+o: Esempio
+o: Esempio S.p.A.
+o: Example
 
 dn: o=Example,c=UK
 objectClass: organization
 o: Example
 o: Example, Ltd.
 
+dn: o=Example,c=US
+objectClass: organization
+o: Example
+o: Example, Inc.
+
 dn: c=IT
 objectClass: country
 c: IT
 
-dn: o=Esempio,c=IT
-objectClass: organization
-o: Esempio
-o: Esempio S.p.A.
-o: Example
-
-dn: c=DE
+dn: c=UK
 objectClass: country
-c: DE
+c: UK
 
-dn: o=Beispiel,c=DE
-objectClass: organization
-o: Beispiel
-o: Beispiel GmbH
-o: Example
+dn: c=US
+objectClass: country
+c: US
 
diff --git a/tests/scripts/test027-emptydn b/tests/scripts/test027-emptydn
index 7257cceca9311cb89df420d9fc0d9e28a040f3ba..597259758b9ecf6d87929dce7fb7b0cb77bb6743 100755
--- a/tests/scripts/test027-emptydn
+++ b/tests/scripts/test027-emptydn
@@ -66,7 +66,7 @@ fi
 
 echo "Searching database..."
 
-$LDAPSEARCH -b "" -h $LOCALHOST -p $PORT1 > $SEARCHOUT 2>&1
+$LDAPSEARCH -S "" -b "" -h $LOCALHOST -p $PORT1 > $SEARCHOUT 2>&1
 
 RC=$?
 if test $RC != 0 ; then
@@ -143,7 +143,7 @@ EOF
 
 echo "Searching database..."
 
-$LDAPSEARCH -b "" -h $LOCALHOST -p $PORT1 > $SEARCHOUT 2>&1
+$LDAPSEARCH -S "" -b "" -h $LOCALHOST -p $PORT1 > $SEARCHOUT 2>&1
 
 RC=$?
 if test $RC != 0 ; then