diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 2b726078deaf1ed5b5123d7c3b09a652e9d7ae17..77ea81673122af91dec7f684f5fbdd5c498ab166 100644
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -129,7 +129,7 @@ read_config( char *fname, Backend **bep, FILE *pfp )
 				    fname, lineno, 0 );
 			} else {
 				char *dn = ch_strdup( cargv[1] );
-				(void) dn_normalize( dn );
+				(void) dn_normalize_case( dn );
 				charray_add( &be->be_suffix, dn );
 			}
 
diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index f16d201317be6a9dafc43b528755033ce0a0d4b7..49a6656fb7e6b768b9ce7ad6a6586ea373c50a03 100755
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -6,6 +6,7 @@ SLURPD=../servers/slurpd/slurpd
 LDAPSEARCH=../clients/tools/ldapsearch
 LDAPMODIFY=../clients/tools/ldapmodify
 LDAPADD=../clients/tools/ldapadd
+LVL=5
 PORT=9009
 SLAVEPORT=9010
 DBDIR=./test-db
diff --git a/tests/scripts/test001-ldif2ldbm b/tests/scripts/test001-ldif2ldbm
index 49f00671b1d8b46dafa5711f27ca0703005f00fa..64deb66b875b4b2d16e14c264d1d985fd8d35a2b 100755
--- a/tests/scripts/test001-ldif2ldbm
+++ b/tests/scripts/test001-ldif2ldbm
@@ -25,7 +25,7 @@ if [ $RC != 0 ]; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -p $PORT -d 1 > $MASTERLOG 2>&1 &
+$SLAPD -f $CONF -p $PORT -d $LVL > $MASTERLOG 2>&1 &
 PID=$!
 
 echo "Using ldapsearch to retrieve all the entries..."
diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd
index 49f00671b1d8b46dafa5711f27ca0703005f00fa..64deb66b875b4b2d16e14c264d1d985fd8d35a2b 100755
--- a/tests/scripts/test001-slapadd
+++ b/tests/scripts/test001-slapadd
@@ -25,7 +25,7 @@ if [ $RC != 0 ]; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -p $PORT -d 1 > $MASTERLOG 2>&1 &
+$SLAPD -f $CONF -p $PORT -d $LVL > $MASTERLOG 2>&1 &
 PID=$!
 
 echo "Using ldapsearch to retrieve all the entries..."
diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate
index d5f659b71d70d57e40703279be382f1aba830c84..cc7fc7debdf5ef8787d2cdaf5ac69aafe771c064 100755
--- a/tests/scripts/test002-populate
+++ b/tests/scripts/test002-populate
@@ -13,7 +13,7 @@ echo "Cleaning up in $DBDIR..."
 rm -f $DBDIR/[!C]*
 
 echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -p $PORT -d 1 > $MASTERLOG 2>&1 &
+$SLAPD -f $CONF -p $PORT -d $LVL > $MASTERLOG 2>&1 &
 PID=$!
 
 echo "Using ldapsearch to check that slapd is running..."
diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search
index 661ccc219f39515e6da09cf3af7aa4160931967a..e6d2d6ac9daf4f1ddca52eb8e3cda5a2b347da3c 100755
--- a/tests/scripts/test003-search
+++ b/tests/scripts/test003-search
@@ -21,7 +21,7 @@ if [ $RC != 0 ]; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -p $PORT -d 1 > $MASTERLOG 2>&1 &
+$SLAPD -f $CONF -p $PORT -d $LVL > $MASTERLOG 2>&1 &
 PID=$!
 
 echo "Testing slapd searching..."
diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify
index 46d813e7e7ae241e0fa78d19156c30ce9c21a23a..bea606e7a3751caf46e6274b325a1ba6290f606d 100755
--- a/tests/scripts/test004-modify
+++ b/tests/scripts/test004-modify
@@ -21,7 +21,7 @@ if [ $RC != 0 ]; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -p $PORT -d 1 > $MASTERLOG 2>&1 &
+$SLAPD -f $CONF -p $PORT -d $LVL > $MASTERLOG 2>&1 &
 PID=$!
 
 echo "Testing slapd modify operations..."
diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls
index 6979cf27fa8a1075472076d0e1497eac5af35545..7a1f0f84f51288e6a031e0fd78d28be2b74d7b4a 100755
--- a/tests/scripts/test006-acls
+++ b/tests/scripts/test006-acls
@@ -21,7 +21,7 @@ if [ $RC != 0 ]; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $ACLCONF -p $PORT -d 1 > $MASTERLOG 2>&1 &
+$SLAPD -f $ACLCONF -p $PORT -d $LVL > $MASTERLOG 2>&1 &
 PID=$!
 
 echo "Testing slapd access control..."
diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication
index 58bcfec0a179931ac40793b549ae5ff931dc5408..472d257678be3b631f265e62ecb3445a02735aac 100755
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@@ -30,11 +30,11 @@ echo "Cleaning up in $REPLDIR..."
 rm -f $REPLDIR/[!C]*
 
 echo "Starting master slapd on TCP/IP port $PORT..."
-$SLAPD -f $MASTERCONF -p $PORT -d 1 > $MASTERLOG 2>&1 &
+$SLAPD -f $MASTERCONF -p $PORT -d $LVL > $MASTERLOG 2>&1 &
 PID=$!
 
 echo "Starting slave slapd on TCP/IP port $SLAVEPORT..."
-$SLAPD -f $SLAVECONF -p $SLAVEPORT -d 1 > $SLAVELOG 2>&1 &
+$SLAPD -f $SLAVECONF -p $SLAVEPORT -d $LVL > $SLAVELOG 2>&1 &
 SLAVEPID=$!
 
 echo "Using ldapsearch to check that master slapd is running..."