From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 2 Sep 2020 18:56:53 +0000 (+0000)
Subject: Issue#9333 - Delete unused TIMING variable left over from OpenLDAP 2.0
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~12^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27e7da68d782e575c1ebd6c2b9ceafa398fee7e1;p=thirdparty%2Fopenldap.git

Issue#9333 - Delete unused TIMING variable left over from OpenLDAP 2.0
---

diff --git a/tests/data/regressions/its4184/its4184 b/tests/data/regressions/its4184/its4184
index 4170f05cb0..3a58d5079b 100755
--- a/tests/data/regressions/its4184/its4184
+++ b/tests/data/regressions/its4184/its4184
@@ -33,7 +33,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/data/regressions/its4326/its4326 b/tests/data/regressions/its4326/its4326
index 5118d51a82..514230ee3f 100755
--- a/tests/data/regressions/its4326/its4326
+++ b/tests/data/regressions/its4326/its4326
@@ -41,7 +41,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 SERVERPID=$!
 if test $WAIT != 0 ; then
     echo SERVERPID $SERVERPID
@@ -71,7 +71,7 @@ fi
 
 echo "Starting proxy slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PROXYPID=$!
 if test $WAIT != 0 ; then
     echo PROXYPID $PROXYPID
@@ -167,7 +167,7 @@ case $RC in
 esac
 
 echo "Restarting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 SERVERPID=$!
 if test $WAIT != 0 ; then
     echo SERVERPID $SERVERPID
diff --git a/tests/data/regressions/its4336/its4336 b/tests/data/regressions/its4336/its4336
index ee40ab6631..9edca07ad1 100755
--- a/tests/data/regressions/its4336/its4336
+++ b/tests/data/regressions/its4336/its4336
@@ -46,7 +46,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 SERVERPID=$!
 if test $WAIT != 0 ; then
     echo SERVERPID $SERVERPID
@@ -76,7 +76,7 @@ fi
 
 echo "Starting chain slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PROXYPID=$!
 if test $WAIT != 0 ; then
     echo PROXYPID $PROXYPID
diff --git a/tests/data/regressions/its4448/its4448 b/tests/data/regressions/its4448/its4448
index 9319374451..37a603228f 100755
--- a/tests/data/regressions/its4448/its4448
+++ b/tests/data/regressions/its4448/its4448
@@ -49,7 +49,7 @@ ITSCONF=$ITSDIR/slapd-meta.conf
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -105,7 +105,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF2 > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -144,7 +144,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT3..."
 . $CONFFILTER $BACKEND $MONITORDB < $ITSCONF > $CONF3
-$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
+$SLAPD -f $CONF3 -h $URI3 -d $LVL > $LOG3 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/data/regressions/its6794/its6794 b/tests/data/regressions/its6794/its6794
index d27e85e47c..d82a791c73 100755
--- a/tests/data/regressions/its6794/its6794
+++ b/tests/data/regressions/its6794/its6794
@@ -33,7 +33,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/data/regressions/its7573/its7573 b/tests/data/regressions/its7573/its7573
index 5e5a1119c1..daeba59ca4 100755
--- a/tests/data/regressions/its7573/its7573
+++ b/tests/data/regressions/its7573/its7573
@@ -34,7 +34,7 @@ echo "Starting slapd on TCP/IP port $PORT1... $PWD"
 . $CONFFILTER $BACKEND $MONITORDB < $DYNAMICCONF > $CONFLDIF
 $SLAPADD -F $CONFDIR -n 0 -l $CONFLDIF
 cd $TESTDIR
-$SLAPD -F ./slapd.d -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F ./slapd.d -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/data/regressions/its8427/its8427 b/tests/data/regressions/its8427/its8427
index 41874763a3..39fa5b3649 100755
--- a/tests/data/regressions/its8427/its8427
+++ b/tests/data/regressions/its8427/its8427
@@ -139,7 +139,7 @@ olcOverlay: syncprov
 EOF
 
 echo "Starting provider..."
-$SLAPD -F ./slapd.d -h "$SURIP1 ldaps://127.0.0.2:$PORT1" -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F ./slapd.d -h "$SURIP1 ldaps://127.0.0.2:$PORT1" -d $LVL > $LOG1 2>&1 &
 MASTERPID=$!
 if test $WAIT != 0 ; then
     echo MASTERPID $MASTERPID
@@ -181,7 +181,7 @@ olcSyncRepl: rid=001 provider=ldaps://127.0.0.2:$PORT1
 EOF
 
 echo "Starting consumer..."
-$SLAPD -F ./slapd.d -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -F ./slapd.d -h $URI2 -d $LVL > $LOG2 2>&1 &
 SLAVEPID=$!
 if test $WAIT != 0 ; then
     echo SLAVEPID $SLAVEPID
@@ -252,7 +252,7 @@ sleep $SLEEP2
 
 echo "======================= RESTART =======================" >> $LOG1
 cd $TESTDIR/srv1
-$SLAPD -F slapd.d -h "$SURIP1 ldaps://127.0.0.2:$PORT1" -d $LVL $TIMING >> $LOG1 2>&1 &
+$SLAPD -F slapd.d -h "$SURIP1 ldaps://127.0.0.2:$PORT1" -d $LVL >> $LOG1 2>&1 &
 MASTERPID=$!
 if test $WAIT != 0 ; then
     echo MASTERPID $MASTERPID
diff --git a/tests/data/regressions/its8427/its8427-2 b/tests/data/regressions/its8427/its8427-2
index 5e34da562b..e12207d813 100755
--- a/tests/data/regressions/its8427/its8427-2
+++ b/tests/data/regressions/its8427/its8427-2
@@ -53,7 +53,7 @@ echo "database config" >> $CONF1
 echo "include $TESTDIR/configpw.conf" >> $CONF1
 
 echo "Starting slapd listening on $URIP1 and $SURIP2..."
-$SLAPD -f $CONF1 -h "$URIP1 $SURIP2" -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h "$URIP1 $SURIP2" -d $LVL > $LOG1 2>&1 &
 SERVERPID=$!
 if test $WAIT != 0 ; then
     echo SERVERPID $SERVERPID
@@ -86,7 +86,7 @@ echo "include $TESTDIR/configpw.conf" >> $CONF2
 
 echo "Starting proxy slapd on TCP/IP port $PORT3..."
 . $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf > $CONF2
-$SLAPD -f $CONF2 -h $URI3 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI3 -d $LVL > $LOG2 2>&1 &
 PROXYPID=$!
 if test $WAIT != 0 ; then
     echo PROXYPID $PROXYPID
diff --git a/tests/data/regressions/its8444/its8444 b/tests/data/regressions/its8444/its8444
index c722ad6ec5..dacb308735 100755
--- a/tests/data/regressions/its8444/its8444
+++ b/tests/data/regressions/its8444/its8444
@@ -72,7 +72,7 @@ while [ $n -le $MPR ]; do
 	CFDIR=${XDIR}$n/slapd.d
 
 	echo "Starting provider slapd on TCP/IP URI $MYURI"
-	$SLAPD -F $CFDIR -h $MYURI -d $LVL $TIMING > $MYLOG 2>&1 &
+	$SLAPD -F $CFDIR -h $MYURI -d $LVL > $MYLOG 2>&1 &
 
 	PID=$!
 	if test $WAIT != 0 ; then
diff --git a/tests/data/regressions/its8521/its8521 b/tests/data/regressions/its8521/its8521
index 149e91b1ce..e6dc7d7ed4 100755
--- a/tests/data/regressions/its8521/its8521
+++ b/tests/data/regressions/its8521/its8521
@@ -47,7 +47,7 @@ ITSDIR=$DATADIR/regressions/its$ITS
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd-provider.ldif > $CONFLDIF
 $SLAPADD -F $CFPRO -n 0 -l $CONFLDIF
-$SLAPD -F $CFPRO -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F $CFPRO -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
 	echo PID $PID
@@ -78,7 +78,7 @@ fi
 echo "Starting consumer slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd-consumer.ldif > $CONFLDIF
 $SLAPADD -F $CFCON -n 0 -l $CONFLDIF
-$SLAPD -F $CFCON -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -F $CFCON -h $URI2 -d $LVL > $LOG2 2>&1 &
 SLAVEPID=$!
 if test $WAIT != 0 ; then
 	echo SLAVEPID $SLAVEPID
diff --git a/tests/data/regressions/its8616/its8616 b/tests/data/regressions/its8616/its8616
index fa92ed7dea..44ca347bd4 100755
--- a/tests/data/regressions/its8616/its8616
+++ b/tests/data/regressions/its8616/its8616
@@ -40,7 +40,7 @@ ITSDIR=$DATADIR/regressions/its$ITS
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd-provider.ldif > $CONFLDIF
 $SLAPADD -F $CFPRO -n 0 -l $CONFLDIF
-$SLAPD -F $CFPRO -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F $CFPRO -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
 	echo PID $PID
diff --git a/tests/data/regressions/its8663/its8663 b/tests/data/regressions/its8663/its8663
index eb4db57e3a..d6f0150f22 100755
--- a/tests/data/regressions/its8663/its8663
+++ b/tests/data/regressions/its8663/its8663
@@ -40,7 +40,7 @@ ITSDIR=$DATADIR/regressions/its$ITS
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd-provider.ldif > $CONFLDIF
 $SLAPADD -F $CFPRO -n 0 -l $CONFLDIF
-$SLAPD -F $CFPRO -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F $CFPRO -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
 	echo PID $PID
diff --git a/tests/data/regressions/its8752/its8752 b/tests/data/regressions/its8752/its8752
index cff3d84bc8..63317303c4 100755
--- a/tests/data/regressions/its8752/its8752
+++ b/tests/data/regressions/its8752/its8752
@@ -69,7 +69,7 @@ KILLPIDS=
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
 	echo PID $PID
@@ -182,7 +182,7 @@ while [ $n -le $MPR ]; do
 	if [ -f $TESTDIR/slapd.conf ]; then
 		rm -f $TESTDIR/slapd.conf
 	fi
-	$SLAPD -f $MYCONF -h $MYURI  -d $LVL $TIMING >> $MYLOG 2>&1 &
+	$SLAPD -f $MYCONF -h $MYURI  -d $LVL >> $MYLOG 2>&1 &
 	PID=$!
 	if test $WAIT != 0 ; then
 		echo PID $PID
@@ -400,7 +400,7 @@ while [ $n -le $MPR ]; do
     if [ -f $TESTDIR/slapd.conf ]; then
         rm -f $TESTDIR/slapd.conf
     fi
-    $SLAPD -f $MYCONF -h $MYURI  -d $LVL $TIMING >> $MYLOG 2>&1 &
+    $SLAPD -f $MYCONF -h $MYURI  -d $LVL >> $MYLOG 2>&1 &
     PID=$!
     if test $WAIT != 0 ; then
         echo PID $PID
diff --git a/tests/data/regressions/its8800/its8800 b/tests/data/regressions/its8800/its8800
index 99a5dca1bf..7a312b6e23 100755
--- a/tests/data/regressions/its8800/its8800
+++ b/tests/data/regressions/its8800/its8800
@@ -70,7 +70,7 @@ while [ $n -le $MPR ]; do
 	CFDIR=${XDIR}$n/slapd.d
 
 	echo "Starting provider slapd on TCP/IP URI $MYURI"
-	$SLAPD -F $CFDIR -h $MYURI -d $LVL $TIMING > $MYLOG 2>&1 &
+	$SLAPD -F $CFDIR -h $MYURI -d $LVL > $MYLOG 2>&1 &
 
 	PID=$!
 	if test $WAIT != 0 ; then
@@ -146,7 +146,7 @@ echo "done"
 
 echo "Starting provider1 slapd on TCP/IP URI $URI1"
 CFDIR="$TESTDIR/srv1/slapd.d"
-$SLAPD -F $CFDIR -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+$SLAPD -F $CFDIR -h $URI1 -d $LVL >> $LOG1 2>&1 &
 
 PID=$!
 if test $WAIT != 0 ; then
diff --git a/tests/data/regressions/its9282/its9282 b/tests/data/regressions/its9282/its9282
index 366df1cb0d..6572095f48 100755
--- a/tests/data/regressions/its9282/its9282
+++ b/tests/data/regressions/its9282/its9282
@@ -67,7 +67,7 @@ while [ $n -le $MMR ]; do
 	CFDIR=${XDIR}$n/slapd.d
 
 	echo "Starting provider slapd on TCP/IP URI $MYURI"
-	$SLAPD -F $CFDIR -h $MYURI -d $LVL -d sync $TIMING > $MYLOG 2>&1 &
+	$SLAPD -F $CFDIR -h $MYURI -d $LVL -d sync > $MYLOG 2>&1 &
 
 	PID=$!
 	if test $WAIT != 0 ; then
@@ -181,7 +181,7 @@ $LDAPSEARCH -D $MANAGERDN -w $PASSWD -b "$BASEDN" -H $URI2 \
 
 echo "Starting provider1 slapd on TCP/IP URI $URI1"
 CFDIR="$TESTDIR/srv1/slapd.d"
-$SLAPD -F $CFDIR -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+$SLAPD -F $CFDIR -h $URI1 -d $LVL >> $LOG1 2>&1 &
 
 PID=$!
 if test $WAIT != 0 ; then
diff --git a/tests/scripts/passwd-search b/tests/scripts/passwd-search
index bc9be744a7..171462965d 100755
--- a/tests/scripts/passwd-search
+++ b/tests/scripts/passwd-search
@@ -33,7 +33,7 @@ mkdir -p $TESTDIR
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $PASSWDCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test ${WAIT-0} != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/relay b/tests/scripts/relay
index ceb82f7f37..99b74aef68 100755
--- a/tests/scripts/relay
+++ b/tests/scripts/relay
@@ -19,7 +19,7 @@ echo ""
 echo "Starting slapd on TCP/IP port $PORT1..."
 echo "======== Starting slapd with $RELAY backend ========" >> $LOG1
 . $CONFFILTER $BACKEND $MONITORDB < $RELAYCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL >> $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/sql-test000-read b/tests/scripts/sql-test000-read
index 62363a9d6b..56a83defc4 100755
--- a/tests/scripts/sql-test000-read
+++ b/tests/scripts/sql-test000-read
@@ -30,7 +30,7 @@ mkdir -p $TESTDIR
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SQLCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/sql-test001-concurrency b/tests/scripts/sql-test001-concurrency
index e6c09b68c1..ac00a39597 100755
--- a/tests/scripts/sql-test001-concurrency
+++ b/tests/scripts/sql-test001-concurrency
@@ -41,7 +41,7 @@ mkdir -p $TESTDIR $SQLDATADIR
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SQLCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/sql-test900-write b/tests/scripts/sql-test900-write
index fbe93385bb..c208dd0c22 100755
--- a/tests/scripts/sql-test900-write
+++ b/tests/scripts/sql-test900-write
@@ -35,7 +35,7 @@ mkdir -p $TESTDIR
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SQLCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/sql-test901-syncrepl b/tests/scripts/sql-test901-syncrepl
index 66b2adcf8b..b61a4cc117 100755
--- a/tests/scripts/sql-test901-syncrepl
+++ b/tests/scripts/sql-test901-syncrepl
@@ -35,7 +35,7 @@ mkdir -p $TESTDIR $DBDIR2A
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SQLSRPROVIDERCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -63,7 +63,7 @@ fi
 
 echo "Starting consumer slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $R1SRCONSUMERCONF > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID
diff --git a/tests/scripts/start-server b/tests/scripts/start-server
index dd16de5517..aab53469dc 100755
--- a/tests/scripts/start-server
+++ b/tests/scripts/start-server
@@ -29,7 +29,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND < $CONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 
 echo "Using ldapsearch to retrieve all the entries..."
diff --git a/tests/scripts/start-server-nolog b/tests/scripts/start-server-nolog
index a367581ccc..91209d1755 100755
--- a/tests/scripts/start-server-nolog
+++ b/tests/scripts/start-server-nolog
@@ -29,7 +29,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND < $CONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING >> /dev/null 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL >> /dev/null 2>&1 &
 PID=$!
 
 echo "Using ldapsearch to retrieve all the entries..."
diff --git a/tests/scripts/start-server2 b/tests/scripts/start-server2
index 5c728d0f93..8353693434 100755
--- a/tests/scripts/start-server2
+++ b/tests/scripts/start-server2
@@ -20,7 +20,7 @@ mkdir -p $TESTDIR $DBDIR2
 
 echo "Starting slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND < $CONFTWO > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID=$!
 
 echo "Using ldapsearch to retrieve all the entries..."
diff --git a/tests/scripts/start-server2-nolog b/tests/scripts/start-server2-nolog
index f95f94ee44..5cea5f3d2e 100755
--- a/tests/scripts/start-server2-nolog
+++ b/tests/scripts/start-server2-nolog
@@ -20,7 +20,7 @@ mkdir -p $TESTDIR $DBDIR2
 
 echo "Starting slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND < $CONFTWO > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > /dev/null 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > /dev/null 2>&1 &
 PID=$!
 
 echo "Using ldapsearch to retrieve all the entries..."
diff --git a/tests/scripts/startup_nis_ldap_server.sh b/tests/scripts/startup_nis_ldap_server.sh
index e531b00ebd..151440daaf 100755
--- a/tests/scripts/startup_nis_ldap_server.sh
+++ b/tests/scripts/startup_nis_ldap_server.sh
@@ -47,7 +47,7 @@ if [ $RC != 0 ]; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $NIS_CONF -p $PORT -d $LVL $TIMING > $PROVIDERLOG 2>&1 &
+$SLAPD -f $NIS_CONF -p $PORT -d $LVL > $PROVIDERLOG 2>&1 &
 PID=$!
 
 echo ">>>>> LDAP server with NIS schema is up! PID=$PID"
diff --git a/tests/scripts/test000-rootdse b/tests/scripts/test000-rootdse
index a461a4b496..f17e7fd549 100755
--- a/tests/scripts/test000-rootdse
+++ b/tests/scripts/test000-rootdse
@@ -20,7 +20,7 @@ mkdir -p $TESTDIR $DBDIR1
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SCHEMACONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd
index 5df7404964..1684ca39bb 100755
--- a/tests/scripts/test001-slapadd
+++ b/tests/scripts/test001-slapadd
@@ -29,7 +29,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -93,7 +93,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate
index 4fbace8128..52afea51cf 100755
--- a/tests/scripts/test002-populate
+++ b/tests/scripts/test002-populate
@@ -20,7 +20,7 @@ mkdir -p $TESTDIR $DBDIR1
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search
index 9454fd7104..7bd2a2818a 100755
--- a/tests/scripts/test003-search
+++ b/tests/scripts/test003-search
@@ -37,7 +37,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify
index 573ba07044..9d472de864 100755
--- a/tests/scripts/test004-modify
+++ b/tests/scripts/test004-modify
@@ -28,7 +28,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn
index 694fc3b1ff..95421bfbc4 100755
--- a/tests/scripts/test005-modrdn
+++ b/tests/scripts/test005-modrdn
@@ -28,7 +28,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls
index 8fdb6e8d18..f0cf563ae6 100755
--- a/tests/scripts/test006-acls
+++ b/tests/scripts/test006-acls
@@ -33,7 +33,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test007-slapmodify b/tests/scripts/test007-slapmodify
index a34ca59d2d..377e5a4a06 100755
--- a/tests/scripts/test007-slapmodify
+++ b/tests/scripts/test007-slapmodify
@@ -37,7 +37,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test008-concurrency b/tests/scripts/test008-concurrency
index eb49638dd0..b14cd9f542 100755
--- a/tests/scripts/test008-concurrency
+++ b/tests/scripts/test008-concurrency
@@ -32,7 +32,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test009-referral b/tests/scripts/test009-referral
index 7f0de605d1..73754b4dd6 100755
--- a/tests/scripts/test009-referral
+++ b/tests/scripts/test009-referral
@@ -32,7 +32,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting provider slapd on TCP/IP port $PORT1..."
-$SLAPD -n provider -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -n provider -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -41,7 +41,7 @@ fi
 
 echo "Starting consumer slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $REFCONSUMERCONF > $CONF2
-$SLAPD -n consumer -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -n consumer -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID
diff --git a/tests/scripts/test010-passwd b/tests/scripts/test010-passwd
index 9c9b8712cc..b0cc28f081 100755
--- a/tests/scripts/test010-passwd
+++ b/tests/scripts/test010-passwd
@@ -20,7 +20,7 @@ mkdir -p $TESTDIR $DBDIR1
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $PWCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test011-glue-slapadd b/tests/scripts/test011-glue-slapadd
index 8a288166d6..682ed933d3 100755
--- a/tests/scripts/test011-glue-slapadd
+++ b/tests/scripts/test011-glue-slapadd
@@ -28,7 +28,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test012-glue-populate b/tests/scripts/test012-glue-populate
index a8d5d3dbf2..d587bbd509 100755
--- a/tests/scripts/test012-glue-populate
+++ b/tests/scripts/test012-glue-populate
@@ -20,7 +20,7 @@ mkdir -p $TESTDIR $DBDIR1A $DBDIR1B $DBDIR1C
 
 echo "Starting slapd on TCP/IP port $PORT..."
 . $CONFFILTER $BACKEND $MONITORDB < $GLUECONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test013-language b/tests/scripts/test013-language
index b06e1a620f..d017b77430 100755
--- a/tests/scripts/test013-language
+++ b/tests/scripts/test013-language
@@ -20,7 +20,7 @@ mkdir -p $TESTDIR $DBDIR1
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test014-whoami b/tests/scripts/test014-whoami
index 07fd202275..8912d3f7cf 100755
--- a/tests/scripts/test014-whoami
+++ b/tests/scripts/test014-whoami
@@ -29,7 +29,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT..."
 . $CONFFILTER $BACKEND $MONITORDB < $WHOAMICONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test015-xsearch b/tests/scripts/test015-xsearch
index 634bb60a77..34acbebc7e 100755
--- a/tests/scripts/test015-xsearch
+++ b/tests/scripts/test015-xsearch
@@ -37,7 +37,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test016-subref b/tests/scripts/test016-subref
index 6764986059..faba05a81f 100755
--- a/tests/scripts/test016-subref
+++ b/tests/scripts/test016-subref
@@ -31,7 +31,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test017-syncreplication-refresh b/tests/scripts/test017-syncreplication-refresh
index 4416b3e5eb..8c6d7b3f63 100755
--- a/tests/scripts/test017-syncreplication-refresh
+++ b/tests/scripts/test017-syncreplication-refresh
@@ -35,7 +35,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2
 
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SRPROVIDERCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -75,7 +75,7 @@ fi
 
 echo "Starting consumer slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $R1SRCONSUMERCONF > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID
diff --git a/tests/scripts/test018-syncreplication-persist b/tests/scripts/test018-syncreplication-persist
index b422724533..74d5ee236b 100755
--- a/tests/scripts/test018-syncreplication-persist
+++ b/tests/scripts/test018-syncreplication-persist
@@ -37,7 +37,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR4
 
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SRPROVIDERCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -77,7 +77,7 @@ fi
 
 echo "Starting consumer slapd on TCP/IP port $PORT4..."
 . $CONFFILTER $BACKEND $MONITORDB < $P1SRCONSUMERCONF > $CONF4
-$SLAPD -f $CONF4 -h $URI4 -d $LVL $TIMING > $LOG4 2>&1 &
+$SLAPD -f $CONF4 -h $URI4 -d $LVL > $LOG4 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID
@@ -159,7 +159,7 @@ kill -HUP "$PID"
 wait $PID
 sleep 10
 echo "RESTART" >> $LOG1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL >> $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -413,7 +413,7 @@ fi
 
 echo "Restarting consumer..."
 echo "RESTART" >> $LOG4
-$SLAPD -f $CONF4 -h $URI4 -d $LVL $TIMING >> $LOG4 2>&1 &
+$SLAPD -f $CONF4 -h $URI4 -d $LVL >> $LOG4 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID
diff --git a/tests/scripts/test019-syncreplication-cascade b/tests/scripts/test019-syncreplication-cascade
index 0a0e131f4b..8dab8e7922 100755
--- a/tests/scripts/test019-syncreplication-cascade
+++ b/tests/scripts/test019-syncreplication-cascade
@@ -34,7 +34,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2 $DBDIR3 $DBDIR4 $DBDIR5 $DBDIR6
 
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SRPROVIDERCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -74,7 +74,7 @@ fi
 
 echo "Starting R1 consumer slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $R1SRCONSUMERCONF > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMER R1 PID $CONSUMERPID
@@ -104,7 +104,7 @@ fi
 
 echo "Starting R2 consumer slapd on TCP/IP port $PORT3..."
 . $CONFFILTER $BACKEND $MONITORDB < $R2SRCONSUMERCONF > $CONF3
-$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
+$SLAPD -f $CONF3 -h $URI3 -d $LVL > $LOG3 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMER R2 PID $CONSUMERPID
@@ -134,7 +134,7 @@ fi
 
 echo "Starting P1 consumer slapd on TCP/IP port $PORT4..."
 . $CONFFILTER $BACKEND $MONITORDB < $P1SRCONSUMERCONF > $CONF4
-$SLAPD -f $CONF4 -h $URI4 -d $LVL $TIMING > $LOG4 2>&1 &
+$SLAPD -f $CONF4 -h $URI4 -d $LVL > $LOG4 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMER P1 PID $CONSUMERPID
@@ -164,7 +164,7 @@ fi
 
 echo "Starting P2 consumer slapd on TCP/IP port $PORT5..."
 . $CONFFILTER $BACKEND $MONITORDB < $P2SRCONSUMERCONF > $CONF5
-$SLAPD -f $CONF5 -h $URI5 -d $LVL $TIMING > $LOG5 2>&1 &
+$SLAPD -f $CONF5 -h $URI5 -d $LVL > $LOG5 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMER P2 PID $CONSUMERPID
@@ -194,7 +194,7 @@ fi
 
 echo "Starting P3 consumer slapd on TCP/IP port $PORT6..."
 . $CONFFILTER $BACKEND $MONITORDB < $P3SRCONSUMERCONF > $CONF6
-$SLAPD -f $CONF6 -h $URI6 -d $LVL $TIMING > $LOG6 2>&1 &
+$SLAPD -f $CONF6 -h $URI6 -d $LVL > $LOG6 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMER P3 PID $CONSUMERPID
diff --git a/tests/scripts/test021-certificate b/tests/scripts/test021-certificate
index 417fc98422..3f1589b7a3 100755
--- a/tests/scripts/test021-certificate
+++ b/tests/scripts/test021-certificate
@@ -29,8 +29,8 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-#valgrind -v --gdb-attach=yes --logfile=info --num-callers=16 --leak-check=yes --leak-resolution=high $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING </dev/tty > $LOG1 2>&1 &
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+#valgrind -v --gdb-attach=yes --logfile=info --num-callers=16 --leak-check=yes --leak-resolution=high $SLAPD -f $CONF1 -h $URI1 -d $LVL </dev/tty > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test022-ppolicy b/tests/scripts/test022-ppolicy
index 6e8eae024c..7d536b5bc5 100755
--- a/tests/scripts/test022-ppolicy
+++ b/tests/scripts/test022-ppolicy
@@ -28,7 +28,7 @@ echo "rootpw `$SLAPPASSWD -T $CONFIGPWF`" >$TESTDIR/configpw.conf
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $PPOLICYCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -531,7 +531,7 @@ echo "Setting up policy state forwarding test..."
 mkdir $DBDIR2
 sed -e "s,$DBDIR1,$DBDIR2," < $CONF1 > $CONF2
 echo "Starting slapd consumer on TCP/IP port $PORT2..."
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test023-refint b/tests/scripts/test023-refint
index 3e3614f5c2..938049680d 100755
--- a/tests/scripts/test023-refint
+++ b/tests/scripts/test023-refint
@@ -33,7 +33,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test024-unique b/tests/scripts/test024-unique
index d6bc8fe606..8ca1be6b25 100755
--- a/tests/scripts/test024-unique
+++ b/tests/scripts/test024-unique
@@ -41,7 +41,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 mkdir $TESTDIR/confdir
-$SLAPD -f $CONF1 -F $TESTDIR/confdir -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -F $TESTDIR/confdir -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test025-limits b/tests/scripts/test025-limits
index 551b969a11..36c0e4b0b0 100755
--- a/tests/scripts/test025-limits
+++ b/tests/scripts/test025-limits
@@ -44,7 +44,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test026-dn b/tests/scripts/test026-dn
index add6f5baa9..25930be337 100755
--- a/tests/scripts/test026-dn
+++ b/tests/scripts/test026-dn
@@ -20,7 +20,7 @@ mkdir -p $TESTDIR $DBDIR1
 
 . $CONFFILTER $BACKEND $MONITORDB < $DNCONF > $CONF1
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test027-emptydn b/tests/scripts/test027-emptydn
index 8661446685..8ac6637268 100755
--- a/tests/scripts/test027-emptydn
+++ b/tests/scripts/test027-emptydn
@@ -36,7 +36,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -98,7 +98,7 @@ echo "Cleaning up database directories..."
 mkdir -p $TESTDIR $DBDIR1 $DBDIR2
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test028-idassert b/tests/scripts/test028-idassert
index ba5e32bba3..5673b6711a 100755
--- a/tests/scripts/test028-idassert
+++ b/tests/scripts/test028-idassert
@@ -66,7 +66,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT..."
 . $CONFFILTER $BACKEND $MONITORDB < $IDASSERTCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test029-ldapglue b/tests/scripts/test029-ldapglue
index f33984433e..cd15c2a479 100755
--- a/tests/scripts/test029-ldapglue
+++ b/tests/scripts/test029-ldapglue
@@ -71,7 +71,7 @@ fi
 
 echo "Starting local slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $LDAPGLUECONF1 > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID1=$!
 if test $WAIT != 0 ; then
     echo PID $PID1
@@ -80,7 +80,7 @@ fi
 
 echo "Starting remote slapd 1 on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $LDAPGLUECONF2 > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID2=$!
 if test $WAIT != 0 ; then
     echo PID $PID2
@@ -89,7 +89,7 @@ fi
 
 echo "Starting remote slapd 2 on TCP/IP port $PORT3..."
 . $CONFFILTER $BACKEND $MONITORDB < $LDAPGLUECONF3 > $CONF3
-$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
+$SLAPD -f $CONF3 -h $URI3 -d $LVL > $LOG3 2>&1 &
 PID3=$!
 if test $WAIT != 0 ; then
     echo PID $PID3
diff --git a/tests/scripts/test031-component-filter b/tests/scripts/test031-component-filter
index 3984008a96..f06ee4e206 100755
--- a/tests/scripts/test031-component-filter
+++ b/tests/scripts/test031-component-filter
@@ -52,7 +52,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $ADDCONF -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $ADDCONF -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test032-chain b/tests/scripts/test032-chain
index becaec0e1e..f6d613ef71 100755
--- a/tests/scripts/test032-chain
+++ b/tests/scripts/test032-chain
@@ -46,7 +46,7 @@ fi
 
 echo "Starting first slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $CHAINCONF1 > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID1=$!
 if test $WAIT != 0 ; then
     echo PID $PID1
@@ -56,7 +56,7 @@ KILLPIDS="$PID1"
 
 echo "Starting second slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $CHAINCONF2 > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID2=$!
 if test $WAIT != 0 ; then
     echo PID $PID2
diff --git a/tests/scripts/test033-glue-syncrepl b/tests/scripts/test033-glue-syncrepl
index c7dc769802..ab3b4c37ae 100755
--- a/tests/scripts/test033-glue-syncrepl
+++ b/tests/scripts/test033-glue-syncrepl
@@ -37,7 +37,7 @@ cp -pr $DBDIR1C $DBDIR2C
 
 echo "Starting slapd 1 on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $GLUESYNCCONF1 > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -61,7 +61,7 @@ done
 
 echo "Starting slapd 2 on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $GLUESYNCCONF2 > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test034-translucent b/tests/scripts/test034-translucent
index d5e333f69c..7c69a267de 100755
--- a/tests/scripts/test034-translucent
+++ b/tests/scripts/test034-translucent
@@ -52,7 +52,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting remote slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -86,7 +86,7 @@ mkdir -p $DBDIR2
 . $CONFFILTER $BACKEND $MONITORDB < $TRANSLUCENTLOCALCONF > $CONF2
 
 echo "Starting local slapd on TCP/IP port $PORT2..."
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test035-meta b/tests/scripts/test035-meta
index c13ede7768..087749acfc 100755
--- a/tests/scripts/test035-meta
+++ b/tests/scripts/test035-meta
@@ -34,7 +34,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF1 > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -73,7 +73,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF2 > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -112,7 +112,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT3..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF > $CONF3
-$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
+$SLAPD -f $CONF3 -h $URI3 -d $LVL > $LOG3 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test036-meta-concurrency b/tests/scripts/test036-meta-concurrency
index 3344f45fb7..693aeca9d1 100755
--- a/tests/scripts/test036-meta-concurrency
+++ b/tests/scripts/test036-meta-concurrency
@@ -42,7 +42,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF1 > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -81,7 +81,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF2 > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -120,7 +120,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT3..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF > $CONF3
-$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
+$SLAPD -f $CONF3 -h $URI3 -d $LVL > $LOG3 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test037-manage b/tests/scripts/test037-manage
index 42171d9ee8..3da9f97915 100755
--- a/tests/scripts/test037-manage
+++ b/tests/scripts/test037-manage
@@ -33,7 +33,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test038-retcode b/tests/scripts/test038-retcode
index 9a8d2625f2..7582cde822 100755
--- a/tests/scripts/test038-retcode
+++ b/tests/scripts/test038-retcode
@@ -42,7 +42,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test039-glue-ldap-concurrency b/tests/scripts/test039-glue-ldap-concurrency
index d11d1bd5f3..59f2f55ae3 100755
--- a/tests/scripts/test039-glue-ldap-concurrency
+++ b/tests/scripts/test039-glue-ldap-concurrency
@@ -46,7 +46,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF1 > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -85,7 +85,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF2 > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -124,7 +124,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT3..."
 . $CONFFILTER $BACKEND $MONITORDB < $GLUELDAPCONF > $CONF3
-$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
+$SLAPD -f $CONF3 -h $URI3 -d $LVL > $LOG3 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test040-subtree-rename b/tests/scripts/test040-subtree-rename
index f1057d6545..7984af3d32 100755
--- a/tests/scripts/test040-subtree-rename
+++ b/tests/scripts/test040-subtree-rename
@@ -20,7 +20,7 @@ mkdir -p $TESTDIR $DBDIR1
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test041-aci b/tests/scripts/test041-aci
index b7ff0bac94..b90534e1f6 100755
--- a/tests/scripts/test041-aci
+++ b/tests/scripts/test041-aci
@@ -39,7 +39,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test042-valsort b/tests/scripts/test042-valsort
index 7026a5731b..f626a0cf10 100755
--- a/tests/scripts/test042-valsort
+++ b/tests/scripts/test042-valsort
@@ -36,7 +36,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test043-delta-syncrepl b/tests/scripts/test043-delta-syncrepl
index 2922214100..9597ee9c8d 100755
--- a/tests/scripts/test043-delta-syncrepl
+++ b/tests/scripts/test043-delta-syncrepl
@@ -46,7 +46,7 @@ SPEC="mdb=a"
 
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $DSRPROVIDERCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -86,7 +86,7 @@ fi
 
 echo "Starting consumer slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $DSRCONSUMERCONF > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID
@@ -131,7 +131,7 @@ echo "Stopping the provider, sleeping 10 seconds and restarting it..."
 kill -HUP "$PID"
 sleep 10
 echo "RESTART" >> $LOG1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL >> $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -321,7 +321,7 @@ EOMODS
 
 echo "Restarting consumer..."
 echo "RESTART" >> $LOG2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING >> $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL >> $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID
diff --git a/tests/scripts/test044-dynlist b/tests/scripts/test044-dynlist
index 07ff6868a4..5ef8bbc2bd 100755
--- a/tests/scripts/test044-dynlist
+++ b/tests/scripts/test044-dynlist
@@ -48,7 +48,7 @@ fi
 
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test045-syncreplication-proxied b/tests/scripts/test045-syncreplication-proxied
index b932fc3dee..0f70488fb1 100755
--- a/tests/scripts/test045-syncreplication-proxied
+++ b/tests/scripts/test045-syncreplication-proxied
@@ -52,7 +52,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2
 
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SRPROVIDERCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PROVIDERPID=$!
 if test $WAIT != 0 ; then
     echo PROVIDERPID $PROVIDERPID
@@ -92,7 +92,7 @@ fi
 
 echo "Starting consumer slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $RCONSUMERCONF > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID
@@ -122,7 +122,7 @@ fi
 
 echo "Starting proxy slapd on TCP/IP port $PORT3..."
 . $CONFFILTER $BACKEND $MONITORDB < $PLSRCONSUMERCONF > $CONF3
-$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
+$SLAPD -f $CONF3 -h $URI3 -d $LVL > $LOG3 2>&1 &
 PROXYPID=$!
 if test $WAIT != 0 ; then
     echo PROXYPID $PROXYPID
@@ -246,7 +246,7 @@ wait $PROVIDERPID
 sleep $SLEEP2
 
 echo "======================= RESTART =======================" >> $LOG1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL >> $LOG1 2>&1 &
 PROVIDERPID=$!
 if test $WAIT != 0 ; then
     echo PROVIDERPID $PROVIDERPID
@@ -460,7 +460,7 @@ EOMODS
 
 echo "Restarting proxy..."
 echo "======================= RESTART =======================" >> $LOG3
-$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING >> $LOG3 2>&1 &
+$SLAPD -f $CONF3 -h $URI3 -d $LVL >> $LOG3 2>&1 &
 PROXYPID=$!
 if test $WAIT != 0 ; then
     echo PROXYPID $PROXYPID
@@ -645,7 +645,7 @@ sleep $SLEEP2
 
 echo "Restarting consumer..."
 echo "======================= RESTART =======================" >> $LOG2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING >> $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL >> $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID
@@ -731,7 +731,7 @@ if test $? != 0 ; then
 
 	echo "	${CHECK}.1 > Restarting proxy..."
 	echo "======================= RESTART =======================" >> $LOG3
-	$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING >> $LOG3 2>&1 &
+	$SLAPD -f $CONF3 -h $URI3 -d $LVL >> $LOG3 2>&1 &
 	PROXYPID=$!
 	if test $WAIT != 0 ; then
 		echo PROXYPID $PROXYPID
diff --git a/tests/scripts/test046-dds b/tests/scripts/test046-dds
index 5534cfe620..25d637ce7b 100755
--- a/tests/scripts/test046-dds
+++ b/tests/scripts/test046-dds
@@ -48,7 +48,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test047-ldap b/tests/scripts/test047-ldap
index 196f992db9..5c9b741a04 100755
--- a/tests/scripts/test047-ldap
+++ b/tests/scripts/test047-ldap
@@ -34,7 +34,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF1 > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -73,7 +73,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF2 > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -112,7 +112,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT3..."
 . $CONFFILTER $BACKEND $MONITORDB < $GLUELDAPCONF > $CONF3
-$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
+$SLAPD -f $CONF3 -h $URI3 -d $LVL > $LOG3 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test048-syncrepl-multiproxy b/tests/scripts/test048-syncrepl-multiproxy
index 61378e1df2..1d76eb8dba 100755
--- a/tests/scripts/test048-syncrepl-multiproxy
+++ b/tests/scripts/test048-syncrepl-multiproxy
@@ -45,7 +45,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2 $DBDIR3
 
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $PLSRPROVIDERCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PROVIDERPID=$!
 if test $WAIT != 0 ; then
     echo PROVIDERPID $PROVIDERPID
@@ -85,7 +85,7 @@ fi
 
 echo "Starting P1 consumer slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $RCONSUMERCONF > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 P1CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo P1CONSUMERPID $P1CONSUMERPID
@@ -115,7 +115,7 @@ fi
 
 echo "Starting R1 consumer slapd on TCP/IP port $PORT3..."
 . $CONFFILTER $BACKEND $MONITORDB < $RCONSUMERCONF | sed -e 's;\.2\.\([^/]*\)$;.3.\1;' > $CONF3
-$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
+$SLAPD -f $CONF3 -h $URI3 -d $LVL > $LOG3 2>&1 &
 R1CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo R1CONSUMERPID $R1CONSUMERPID
@@ -223,7 +223,7 @@ wait $PROVIDERPID
 sleep $SLEEP2
 
 echo "======================= RESTART =======================" >> $LOG1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL >> $LOG1 2>&1 &
 PROVIDERPID=$!
 if test $WAIT != 0 ; then
     echo PROVIDERPID $PROVIDERPID
@@ -432,7 +432,7 @@ EOMODS
 
 echo "Restarting P1 consumer..."
 echo "======================= RESTART =======================" >> $LOG3
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING >> $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL >> $LOG2 2>&1 &
 P1CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo P1CONSUMERPID $P1CONSUMERPID
@@ -441,7 +441,7 @@ fi
 
 echo "Restarting R1 consumer..."
 echo "======================= RESTART =======================" >> $LOG3
-$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING >> $LOG3 2>&1 &
+$SLAPD -f $CONF3 -h $URI3 -d $LVL >> $LOG3 2>&1 &
 R1CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo R1CONSUMERPID $R1CONSUMERPID
diff --git a/tests/scripts/test049-sync-config b/tests/scripts/test049-sync-config
index 440f2c3e13..cc1fbdbf88 100755
--- a/tests/scripts/test049-sync-config
+++ b/tests/scripts/test049-sync-config
@@ -62,7 +62,7 @@ echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $DYNAMICCONF > $CONFLDIF
 $SLAPADD -F $CFPRO -n 0 -l $CONFLDIF
 cd $PRODIR
-$SLAPD -F ./slapd.d -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F ./slapd.d -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -135,7 +135,7 @@ fi
 echo "Starting consumer slapd on TCP/IP port $PORT2..."
 $SLAPADD -F $CFCON -n 0 -l $CONFLDIF
 cd $CONDIR
-$SLAPD -F ./slapd.d -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -F ./slapd.d -h $URI2 -d $LVL > $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID
diff --git a/tests/scripts/test050-syncrepl-multiprovider b/tests/scripts/test050-syncrepl-multiprovider
index c22205e21f..4b6b6f3125 100755
--- a/tests/scripts/test050-syncrepl-multiprovider
+++ b/tests/scripts/test050-syncrepl-multiprovider
@@ -85,7 +85,7 @@ done
 
 echo "Starting server 1 on TCP/IP port $PORT1..."
 cd ${XDIR}1
-$SLAPD -F slapd.d -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F slapd.d -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -186,7 +186,7 @@ URI="ldap://${LOCALHOST}:$PORT/"
 LOG=$TESTDIR/slapd.$n.log
 echo "Starting server $n on TCP/IP port $PORT..."
 cd ${XDIR}$n
-$SLAPD -F ./slapd.d -h $URI -d $LVL $TIMING > $LOG 2>&1 &
+$SLAPD -F ./slapd.d -h $URI -d $LVL > $LOG 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID
@@ -642,7 +642,7 @@ KILLPIDS=""
 echo "Starting server 1 on TCP/IP port $PORT1..."
 echo "======================= RESTART =======================" >> $LOG1
 cd ${XDIR}1
-$SLAPD -F slapd.d -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+$SLAPD -F slapd.d -h $URI1 -d $LVL >> $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -679,7 +679,7 @@ LOG=$TESTDIR/slapd.$n.log
 echo "Starting server $n on TCP/IP port $PORT..."
 cd ${XDIR}$n
 echo "======================= RESTART =======================" >> $LOG
-$SLAPD -F ./slapd.d -h $URI -d $LVL $TIMING >> $LOG 2>&1 &
+$SLAPD -F ./slapd.d -h $URI -d $LVL >> $LOG 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test051-config-undo b/tests/scripts/test051-config-undo
index 65d9264583..d2c168d593 100755
--- a/tests/scripts/test051-config-undo
+++ b/tests/scripts/test051-config-undo
@@ -37,7 +37,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 mkdir $TESTDIR/confdir
-$SLAPD -f $CONF1 -F $TESTDIR/confdir -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -F $TESTDIR/confdir -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test052-memberof b/tests/scripts/test052-memberof
index 7fe3df2250..5de145bbfd 100755
--- a/tests/scripts/test052-memberof
+++ b/tests/scripts/test052-memberof
@@ -28,7 +28,7 @@ echo "rootpw `$SLAPPASSWD -T $CONFIGPWF`" >$TESTDIR/configpw.conf
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $NAKEDCONF > $CONF1
-$SLAPD -f $CONF1 -F $TESTDIR/confdir -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -F $TESTDIR/confdir -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test053-syncprov-glue b/tests/scripts/test053-syncprov-glue
index f1e2a81c93..55d0e0e295 100755
--- a/tests/scripts/test053-syncprov-glue
+++ b/tests/scripts/test053-syncprov-glue
@@ -101,7 +101,7 @@ EOF
 
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 cd $PRODDIR
-$SLAPD -F slapd.d -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F slapd.d -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -129,7 +129,7 @@ fi
 
 echo "Starting provider2 slapd on TCP/IP port $PORT2..."
 cd $PRO2DIR
-$SLAPD -F slapd.d -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -F slapd.d -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -157,7 +157,7 @@ fi
 
 echo "Starting consumer slapd on TCP/IP port $PORT3..."
 cd $CONSDIR
-$SLAPD -F slapd.d -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
+$SLAPD -F slapd.d -h $URI3 -d $LVL > $LOG3 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test054-syncreplication-parallel-load b/tests/scripts/test054-syncreplication-parallel-load
index 6188cab735..1efb20b4e8 100755
--- a/tests/scripts/test054-syncreplication-parallel-load
+++ b/tests/scripts/test054-syncreplication-parallel-load
@@ -35,7 +35,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR4
 
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SRPROVIDERCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -75,7 +75,7 @@ fi
 
 echo "Starting consumer slapd on TCP/IP port $PORT4..."
 . $CONFFILTER $BACKEND $MONITORDB < $P1SRCONSUMERCONF > $CONF4
-$SLAPD -f $CONF4 -h $URI4 -d $LVL $TIMING > $LOG4 2>&1 &
+$SLAPD -f $CONF4 -h $URI4 -d $LVL > $LOG4 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID
@@ -128,7 +128,7 @@ kill -HUP "$PID"
 wait $PID
 sleep 10
 echo "RESTART" >> $LOG1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL >> $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -285,7 +285,7 @@ EOMODS
 
 echo "Restarting consumer..."
 echo "RESTART" >> $LOG4
-$SLAPD -f $CONF4 -h $URI4 -d $LVL $TIMING >> $LOG4 2>&1 &
+$SLAPD -f $CONF4 -h $URI4 -d $LVL >> $LOG4 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID
diff --git a/tests/scripts/test055-valregex b/tests/scripts/test055-valregex
index 7ba745f60a..c4a8104601 100755
--- a/tests/scripts/test055-valregex
+++ b/tests/scripts/test055-valregex
@@ -29,7 +29,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test056-monitor b/tests/scripts/test056-monitor
index 0e1ba20a6b..9727cf4b72 100755
--- a/tests/scripts/test056-monitor
+++ b/tests/scripts/test056-monitor
@@ -25,7 +25,7 @@ mkdir -p $TESTDIR $DBDIR1
 
 echo "Starting slapd on TCP/IP port $PORT..."
 . $CONFFILTER $BACKEND $MONITORDB < $SCHEMACONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test057-memberof-refint b/tests/scripts/test057-memberof-refint
index 75e3e4b870..6be95d3f9c 100755
--- a/tests/scripts/test057-memberof-refint
+++ b/tests/scripts/test057-memberof-refint
@@ -34,7 +34,7 @@ echo "rootpw `$SLAPPASSWD -T $CONFIGPWF`" >$TESTDIR/configpw.conf
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $NAKEDCONF > $CONF1
-$SLAPD -f $CONF1 -F $TESTDIR/confdir -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -F $TESTDIR/confdir -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test058-syncrepl-asymmetric b/tests/scripts/test058-syncrepl-asymmetric
index 5af83d1f07..f8734dc297 100755
--- a/tests/scripts/test058-syncrepl-asymmetric
+++ b/tests/scripts/test058-syncrepl-asymmetric
@@ -195,7 +195,7 @@ done
 
 echo "Starting central provider slapd on TCP/IP port $PORT1..."
 cd $SMC_DIR
-$SLAPD -F slapd.d -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F slapd.d -h $URI1 -d $LVL > $LOG1 2>&1 &
 SMC_PID=$!
 if test $WAIT != 0 ; then
 	echo PID $SMC_PID
@@ -221,7 +221,7 @@ fi
 
 echo "Starting site1 provider slapd on TCP/IP port $PORT2..."
 cd $SM1_DIR
-$SLAPD -F slapd.d -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -F slapd.d -h $URI2 -d $LVL > $LOG2 2>&1 &
 SM1_PID=$!
 if test $WAIT != 0 ; then
 	echo PID $SM1_PID
@@ -247,7 +247,7 @@ fi
 
 echo "Starting site2 provider slapd on TCP/IP port $PORT3..."
 cd $SM2_DIR
-$SLAPD -F slapd.d -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
+$SLAPD -F slapd.d -h $URI3 -d $LVL > $LOG3 2>&1 &
 SM2_PID=$!
 if test $WAIT != 0 ; then
 	echo PID $SM2_PID
@@ -273,7 +273,7 @@ fi
 
 echo "Starting central search slapd on TCP/IP port $PORT4..."
 cd $SSC_DIR
-$SLAPD -F slapd.d -h $URI4 -d $LVL $TIMING > $LOG4 2>&1 &
+$SLAPD -F slapd.d -h $URI4 -d $LVL > $LOG4 2>&1 &
 SSC_PID=$!
 if test $WAIT != 0 ; then
 	echo PID $SSC_PID
@@ -300,7 +300,7 @@ fi
 
 echo "Starting site1 search slapd on TCP/IP port $PORT5..."
 cd $SS1_DIR
-$SLAPD -F slapd.d -h $URI5 -d $LVL $TIMING > $LOG5 2>&1 &
+$SLAPD -F slapd.d -h $URI5 -d $LVL > $LOG5 2>&1 &
 SS1_PID=$!
 if test $WAIT != 0 ; then
 	echo PID $SS1_PID
@@ -327,7 +327,7 @@ fi
 
 echo "Starting site2 search slapd on TCP/IP port $PORT6..."
 cd $SS2_DIR
-$SLAPD -F slapd.d -h $URI6 -d $LVL $TIMING > $LOG6 2>&1 &
+$SLAPD -F slapd.d -h $URI6 -d $LVL > $LOG6 2>&1 &
 SS2_PID=$!
 if test $WAIT != 0 ; then
 	echo PID $SS2_PID
@@ -1007,7 +1007,7 @@ fi
 if test -z "$SM1_PID" ; then
 	echo "Restarting site1 provider slapd on TCP/IP port $PORT2..."
 	cd $SM1_DIR
-	$SLAPD -F slapd.d -h $URI2 -d $LVL $TIMING >> $LOG2 2>&1 &
+	$SLAPD -F slapd.d -h $URI2 -d $LVL >> $LOG2 2>&1 &
 	SM1_PID=$!
 	if test $WAIT != 0 ; then
 	    echo PID $SM1_PID
@@ -1286,7 +1286,7 @@ if test $CSN_ERRORS != 0 ; then
 
 	echo "Restarting site1 provider slapd on TCP/IP port $PORT2..."
 	cd $SM1_DIR
-	$SLAPD -F slapd.d -h $URI2 -d $LVL $TIMING >> $LOG2 2>&1 &
+	$SLAPD -F slapd.d -h $URI2 -d $LVL >> $LOG2 2>&1 &
 	SM1_PID=$!
 	if test $WAIT != 0 ; then
 		echo PID $SM1_PID
@@ -1312,7 +1312,7 @@ if test $CSN_ERRORS != 0 ; then
 
 	echo "Restarting site2 provider slapd on TCP/IP port $PORT3..."
 	cd $SM2_DIR
-	$SLAPD -F slapd.d -h $URI3 -d $LVL $TIMING >> $LOG3 2>&1 &
+	$SLAPD -F slapd.d -h $URI3 -d $LVL >> $LOG3 2>&1 &
 	SM2_PID=$!
 	if test $WAIT != 0 ; then
 		echo PID $SM2_PID
@@ -1338,7 +1338,7 @@ if test $CSN_ERRORS != 0 ; then
 
 	echo "Restarting central provider slapd on TCP/IP port $PORT1..."
 	cd $SMC_DIR
-	$SLAPD -F slapd.d -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+	$SLAPD -F slapd.d -h $URI1 -d $LVL >> $LOG1 2>&1 &
 	SMC_PID=$!
 	if test $WAIT != 0 ; then
 		echo PID $SMC_PID
@@ -1372,7 +1372,7 @@ if test $CSN_ERRORS != 0 ; then
 
 	echo "Restarting site1 provider slapd on TCP/IP port $PORT2..."
 	cd $SM1_DIR
-	$SLAPD -F slapd.d -h $URI2 -d $LVL $TIMING >> $LOG2 2>&1 &
+	$SLAPD -F slapd.d -h $URI2 -d $LVL >> $LOG2 2>&1 &
 	SM1_PID=$!
 	if test $WAIT != 0 ; then
 		echo PID $SM1_PID
@@ -1398,7 +1398,7 @@ if test $CSN_ERRORS != 0 ; then
 
 	echo "Restarting site2 provider slapd on TCP/IP port $PORT3..."
 	cd $SM2_DIR
-	$SLAPD -F slapd.d -h $URI3 -d $LVL $TIMING >> $LOG3 2>&1 &
+	$SLAPD -F slapd.d -h $URI3 -d $LVL >> $LOG3 2>&1 &
 	SM2_PID=$!
 	if test $WAIT != 0 ; then
 		echo PID $SM2_PID
@@ -1427,7 +1427,7 @@ if test $CSN_ERRORS != 0 ; then
 
 	echo "Restarting central search slapd on TCP/IP port $PORT4..."
 	cd $SSC_DIR
-	$SLAPD -F slapd.d -h $URI4 -d $LVL $TIMING >> $LOG4 2>&1 &
+	$SLAPD -F slapd.d -h $URI4 -d $LVL >> $LOG4 2>&1 &
 	SSC_PID=$!
 	if test $WAIT != 0 ; then
 		echo PID $SSC_PID
@@ -1453,7 +1453,7 @@ if test $CSN_ERRORS != 0 ; then
 
 	echo "Restarting site1 search slapd on TCP/IP port $PORT5..."
 	cd $SS1_DIR
-	$SLAPD -F slapd.d -h $URI5 -d $LVL $TIMING >> $LOG5 2>&1 &
+	$SLAPD -F slapd.d -h $URI5 -d $LVL >> $LOG5 2>&1 &
 	SS1_PID=$!
 	if test $WAIT != 0 ; then
 		echo PID $SS1_PID
@@ -1479,7 +1479,7 @@ if test $CSN_ERRORS != 0 ; then
 
 	echo "Restarting site2 search slapd on TCP/IP port $PORT6..."
 	cd $SS2_DIR
-	$SLAPD -F slapd.d -h $URI6 -d $LVL $TIMING >> $LOG6 2>&1 &
+	$SLAPD -F slapd.d -h $URI6 -d $LVL >> $LOG6 2>&1 &
 	SS2_PID=$!
 	if test $WAIT != 0 ; then
 		echo PID $SS2_PID
@@ -2041,7 +2041,7 @@ rm -rf $SS2_DIR/db/*
 
 echo "Starting site2 provider slapd on TCP/IP port $PORT3..."
 cd $SM2_DIR
-$SLAPD -F slapd.d -h $URI3 -d $LVL $TIMING >> $LOG3 2>&1 &
+$SLAPD -F slapd.d -h $URI3 -d $LVL >> $LOG3 2>&1 &
 SM2_PID=$!
 if test $WAIT != 0 ; then
 	echo PID $SM2_PID
@@ -2067,7 +2067,7 @@ fi
 
 echo "Starting site2 search slapd on TCP/IP port $PORT6..."
 cd $SS2_DIR
-$SLAPD -F slapd.d -h $URI6 -d $LVL $TIMING >> $LOG6 2>&1 &
+$SLAPD -F slapd.d -h $URI6 -d $LVL >> $LOG6 2>&1 &
 SS2_PID=$!
 if test $WAIT != 0 ; then
 	echo PID $SS2_PID
@@ -2093,7 +2093,7 @@ fi
 
 echo "Starting central provider slapd on TCP/IP port $PORT1..."
 cd $SMC_DIR
-$SLAPD -F slapd.d -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+$SLAPD -F slapd.d -h $URI1 -d $LVL >> $LOG1 2>&1 &
 SMC_PID=$!
 if test $WAIT != 0 ; then
 	echo PID $SMC_PID
@@ -2211,7 +2211,7 @@ if test $RC != 0 ; then
 	KILLPIDS=`echo "$KILLPIDS " | sed -e "s/ $SMC_PID / /"`;
 
 	cd $SMC_DIR
-	$SLAPD -F slapd.d -h $URI1 -c rid=4,csn=0 -d $LVL $TIMING >> $LOG1 2>&1 &
+	$SLAPD -F slapd.d -h $URI1 -c rid=4,csn=0 -d $LVL >> $LOG1 2>&1 &
 	SMC_PID=$!
 	if test $WAIT != 0 ; then
 		echo PID $SMC_PID
@@ -2277,7 +2277,7 @@ if test $RC != 0 ; then
 	KILLPIDS=`echo "$KILLPIDS " | sed -e "s/ $SSC_PID / /"`;
 
 	cd $SSC_DIR
-	$SLAPD -F slapd.d -h $URI4 -c rid=1,csn=0 -d $LVL $TIMING >> $LOG4 2>&1 &
+	$SLAPD -F slapd.d -h $URI4 -c rid=1,csn=0 -d $LVL >> $LOG4 2>&1 &
 	SSC_PID=$!
 	if test $WAIT != 0 ; then
 		echo PID $SSC_PID
@@ -2364,7 +2364,7 @@ EOF
 
 	echo "Starting central provider again..."
 	cd $SMC_DIR
-	$SLAPD -F slapd.d -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+	$SLAPD -F slapd.d -h $URI1 -d $LVL >> $LOG1 2>&1 &
 	SMC_PID=$!
 	KILLPIDS="$KILLPIDS $SMC_PID"
 	cd $TESTWD
@@ -2410,7 +2410,7 @@ EOF
 
 	echo "Starting central provider again..."
 	cd $SMC_DIR
-	$SLAPD -F slapd.d -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+	$SLAPD -F slapd.d -h $URI1 -d $LVL >> $LOG1 2>&1 &
 	SMC_PID=$!
 	KILLPIDS="$KILLPIDS $SMC_PID"
 	cd $TESTWD
diff --git a/tests/scripts/test059-consumer-config b/tests/scripts/test059-consumer-config
index 3a1bd6003e..328f92e268 100755
--- a/tests/scripts/test059-consumer-config
+++ b/tests/scripts/test059-consumer-config
@@ -57,7 +57,7 @@ esac
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $DYNAMICCONF > $CONFLDIF
 $SLAPADD -F $CFPRO -n 0 -l $CONFLDIF
-$SLAPD -F $CFPRO -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F $CFPRO -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -187,7 +187,7 @@ fi
 
 echo "Starting consumer slapd on TCP/IP port $PORT2..."
 $SLAPADD -F $CFCON -n 0 -l $CONFLDIF
-$SLAPD -F $CFCON -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -F $CFCON -h $URI2 -d $LVL > $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID
diff --git a/tests/scripts/test060-mt-hot b/tests/scripts/test060-mt-hot
index 8443ffb493..c8beab01de 100755
--- a/tests/scripts/test060-mt-hot
+++ b/tests/scripts/test060-mt-hot
@@ -56,8 +56,8 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-echo $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+echo $SLAPD -f $CONF1 -h $URI1 -d $LVL
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test061-syncreplication-initiation b/tests/scripts/test061-syncreplication-initiation
index a8f1076833..76f96ff79a 100755
--- a/tests/scripts/test061-syncreplication-initiation
+++ b/tests/scripts/test061-syncreplication-initiation
@@ -86,7 +86,7 @@ done
 
 echo "Starting provider slapd on $PROV_URI"
 cd $PROV_DIR
-$SLAPD -F slapd.d -h $PROV_URI -d $LVL $TIMING >> $PROV_LOG 2>&1 &
+$SLAPD -F slapd.d -h $PROV_URI -d $LVL >> $PROV_LOG 2>&1 &
 PROV_PID=$!
 if test $WAIT != 0 ; then
 	echo PID $PROV_PID
@@ -111,7 +111,7 @@ fi
 
 echo "Starting forward1 slapd on $FWD1_URI"
 cd $FWD1_DIR
-$SLAPD -F slapd.d -h $FWD1_URI -d $LVL $TIMING >> $FWD1_LOG 2>&1 &
+$SLAPD -F slapd.d -h $FWD1_URI -d $LVL >> $FWD1_LOG 2>&1 &
 FWD1_PID=$!
 if test $WAIT != 0 ; then
 	echo PID $FWD1_PID
@@ -136,7 +136,7 @@ fi
 
 echo "Starting consumer slapd on $CONS_URI"
 cd $CONS_DIR
-$SLAPD -F slapd.d -h $CONS_URI -d $LVL $TIMING >> $CONS_LOG 2>&1 &
+$SLAPD -F slapd.d -h $CONS_URI -d $LVL >> $CONS_LOG 2>&1 &
 CONS_PID=$!
 if test $WAIT != 0 ; then
 	echo PID $CONS_PID
@@ -374,7 +374,7 @@ EOF
 
 	echo "Starting forwarders again"
 	cd $FWD1_DIR
-	$SLAPD -F slapd.d -h $FWD1_URI -d $LVL $TIMING >> $FWD1_LOG 2>&1 &
+	$SLAPD -F slapd.d -h $FWD1_URI -d $LVL >> $FWD1_LOG 2>&1 &
 	FWD1_PID=$!
 	KILLPIDS="$KILLPIDS $FWD1_PID"
 	cd $TESTWD
@@ -470,7 +470,7 @@ EOF
 
 	echo "Starting forwarders again"
 	cd $FWD1_DIR
-	$SLAPD -F slapd.d -h $FWD1_URI -d $LVL $TIMING >> $FWD1_LOG 2>&1 &
+	$SLAPD -F slapd.d -h $FWD1_URI -d $LVL >> $FWD1_LOG 2>&1 &
 	FWD1_PID=$!
 	KILLPIDS="$KILLPIDS $FWD1_PID"
 	cd $TESTWD
@@ -576,7 +576,7 @@ EOF
 
 	echo "Starting forwarders again"
 	cd $FWD1_DIR
-	$SLAPD -F slapd.d -h $FWD1_URI -d $LVL $TIMING >> $FWD1_LOG 2>&1 &
+	$SLAPD -F slapd.d -h $FWD1_URI -d $LVL >> $FWD1_LOG 2>&1 &
 	FWD1_PID=$!
 	KILLPIDS="$KILLPIDS $FWD1_PID"
 	cd $TESTWD
diff --git a/tests/scripts/test062-config-delete b/tests/scripts/test062-config-delete
index c7a1ed299d..139e463599 100755
--- a/tests/scripts/test062-config-delete
+++ b/tests/scripts/test062-config-delete
@@ -40,7 +40,7 @@ echo "Starting slapd on TCP/IP port $PORT1... $PWD"
 . $CONFFILTER $BACKEND $MONITORDB < $DYNAMICCONF > $CONFLDIF
 $SLAPADD -F $CONFDIR -n 0 -l $CONFLDIF
 cd $TESTDIR
-$SLAPD -F ./slapd.d -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F ./slapd.d -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test063-delta-multiprovider b/tests/scripts/test063-delta-multiprovider
index 3f7dd5c6f0..6fa6c2ebfc 100755
--- a/tests/scripts/test063-delta-multiprovider
+++ b/tests/scripts/test063-delta-multiprovider
@@ -191,7 +191,7 @@ PORT=`eval echo '$PORT'$n`
 echo "Starting server $n on TCP/IP port $PORT..."
 cd ${XDIR}${n}
 LOG=`eval echo '$LOG'$n`
-$SLAPD -F slapd.d -h $MYURI -d $LVL $TIMING > $LOG 2>&1 &
+$SLAPD -F slapd.d -h $MYURI -d $LVL > $LOG 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test064-constraint b/tests/scripts/test064-constraint
index dd7b1675e6..b984987196 100755
--- a/tests/scripts/test064-constraint
+++ b/tests/scripts/test064-constraint
@@ -122,7 +122,7 @@ EOF
 $SLAPADD -F $CONFDIR -n 0 -l $TESTDIR/config.ldif
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -F $CONFDIR -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F $CONFDIR -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
 	echo PID $PID
diff --git a/tests/scripts/test066-autoca b/tests/scripts/test066-autoca
index b94408fbc6..6c59d41cbd 100755
--- a/tests/scripts/test066-autoca
+++ b/tests/scripts/test066-autoca
@@ -40,7 +40,7 @@ $SLAPPASSWD -g -n >$CONFIGPWF
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $DYNAMICCONF > $CONFLDIF
 $SLAPADD -F $CFDIR -n 0 -l $CONFLDIF
-$SLAPD -F $CFDIR -h $URIP1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F $CFDIR -h $URIP1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test067-tls b/tests/scripts/test067-tls
index d16b336463..d85eadaca1 100755
--- a/tests/scripts/test067-tls
+++ b/tests/scripts/test067-tls
@@ -59,7 +59,7 @@ fi
 
 echo "Starting ldap:/// slapd on TCP/IP port $PORT1 and ldaps:/// slapd on $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $TLSCONF > $CONF1
-$SLAPD -f $CONF1 -h "$URI1 $SURI2" -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h "$URI1 $SURI2" -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test068-sasl-tls-external b/tests/scripts/test068-sasl-tls-external
index 0b91aa197f..71fcfce903 100755
--- a/tests/scripts/test068-sasl-tls-external
+++ b/tests/scripts/test068-sasl-tls-external
@@ -36,7 +36,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting ldap:/// slapd on TCP/IP port $PORT1 and ldaps:/// slapd on $PORT2..."
-$SLAPD -f $CONF1 -h "$URI1 $SURI2" -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h "$URI1 $SURI2" -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test069-delta-multiprovider-starttls b/tests/scripts/test069-delta-multiprovider-starttls
index f5013fbaff..7fdc183061 100755
--- a/tests/scripts/test069-delta-multiprovider-starttls
+++ b/tests/scripts/test069-delta-multiprovider-starttls
@@ -200,7 +200,7 @@ PORT=`eval echo '$PORT'$n`
 echo "Starting server $n on TCP/IP port $PORT..."
 cd ${XDIR}${n}
 LOG=`eval echo '$LOG'$n`
-$SLAPD -F slapd.d -h $MYURI -d $LVL $TIMING > $LOG 2>&1 &
+$SLAPD -F slapd.d -h $MYURI -d $LVL > $LOG 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test070-delta-multiprovider-ldaps b/tests/scripts/test070-delta-multiprovider-ldaps
index fe824a66f3..030ba3a129 100755
--- a/tests/scripts/test070-delta-multiprovider-ldaps
+++ b/tests/scripts/test070-delta-multiprovider-ldaps
@@ -199,7 +199,7 @@ PORT=`eval echo '$PORT'$n`
 echo "Starting server $n on TCP/IP port $PORT..."
 cd ${XDIR}${n}
 LOG=`eval echo '$LOG'$n`
-$SLAPD -F slapd.d -h $MYURI -d $LVL $TIMING > $LOG 2>&1 &
+$SLAPD -F slapd.d -h $MYURI -d $LVL > $LOG 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test071-dirsync b/tests/scripts/test071-dirsync
index d73b1957d1..789531e3ad 100755
--- a/tests/scripts/test071-dirsync
+++ b/tests/scripts/test071-dirsync
@@ -88,7 +88,7 @@ objectclass: dcObject
 o: OpenLDAP Testing
 
 EOMODS
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID
diff --git a/tests/scripts/test072-dsee-sync b/tests/scripts/test072-dsee-sync
index 9fe844b250..1e351d5f97 100755
--- a/tests/scripts/test072-dsee-sync
+++ b/tests/scripts/test072-dsee-sync
@@ -70,7 +70,7 @@ fi
 
 echo "Starting consumer slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $DSEESYNC1CONF > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID
diff --git a/tests/scripts/test073-asyncmeta b/tests/scripts/test073-asyncmeta
index 6110456e54..6874e43ea7 100755
--- a/tests/scripts/test073-asyncmeta
+++ b/tests/scripts/test073-asyncmeta
@@ -34,7 +34,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF1 > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -73,7 +73,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF2 > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -112,7 +112,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT3..."
 . $CONFFILTER $BACKEND $MONITORDB < $ASYNCMETACONF > $CONF3
-$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
+$SLAPD -f $CONF3 -h $URI3 -d $LVL > $LOG3 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test074-asyncmeta-concurrency b/tests/scripts/test074-asyncmeta-concurrency
index a78b6f6df4..9d4ab285b4 100755
--- a/tests/scripts/test074-asyncmeta-concurrency
+++ b/tests/scripts/test074-asyncmeta-concurrency
@@ -42,7 +42,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF1 > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -81,7 +81,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF2 > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -120,7 +120,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT3..."
 . $CONFFILTER $BACKEND $MONITORDB < $ASYNCMETACONF > $CONF3
-$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
+$SLAPD -f $CONF3 -h $URI3 -d $LVL > $LOG3 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test075-dsee-persist b/tests/scripts/test075-dsee-persist
index 3b4d44392f..dbf2144337 100755
--- a/tests/scripts/test075-dsee-persist
+++ b/tests/scripts/test075-dsee-persist
@@ -73,7 +73,7 @@ fi
 
 echo "Starting consumer slapd on TCP/IP port $PORT4..."
 . $CONFFILTER $BACKEND $MONITORDB < $DSEESYNC2CONF > $CONF4
-$SLAPD -f $CONF4 -h $URI4 -d $LVL $TIMING > $LOG4 2>&1 &
+$SLAPD -f $CONF4 -h $URI4 -d $LVL > $LOG4 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID
@@ -363,7 +363,7 @@ fi
 
 echo "Restarting consumer..."
 echo "RESTART" >> $LOG4
-$SLAPD -f $CONF4 -h $URI4 -d $LVL $TIMING >> $LOG4 2>&1 &
+$SLAPD -f $CONF4 -h $URI4 -d $LVL >> $LOG4 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID
diff --git a/tests/scripts/test076-authid-rewrite b/tests/scripts/test076-authid-rewrite
index 46f2e06870..f7a89d629a 100755
--- a/tests/scripts/test076-authid-rewrite
+++ b/tests/scripts/test076-authid-rewrite
@@ -32,7 +32,7 @@ echo "Starting slapd on TCP/IP port $PORT1... $PWD"
 . $CONFFILTER $BACKEND $MONITORDB < $DYNAMICCONF > $CONFLDIF
 $SLAPADD -F $CONFDIR -n 0 -l $CONFLDIF
 cd $TESTDIR
-$SLAPD -F ./slapd.d -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F ./slapd.d -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
diff --git a/tests/scripts/test077-sasl-gssapi b/tests/scripts/test077-sasl-gssapi
index 88d5ef8f8e..9631160b10 100755
--- a/tests/scripts/test077-sasl-gssapi
+++ b/tests/scripts/test077-sasl-gssapi
@@ -63,7 +63,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting ldap:/// slapd on TCP/IP port $PORT1 and ldaps:/// slapd on $PORT2..."
-$SLAPD -F $CONFDIR -h "$URI1 $SURI2" -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F $CONFDIR -h "$URI1 $SURI2" -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
 	echo PID $PID
diff --git a/tests/scripts/test078-persistent-sessionlog b/tests/scripts/test078-persistent-sessionlog
index a95256edfc..bc7b77c646 100755
--- a/tests/scripts/test078-persistent-sessionlog
+++ b/tests/scripts/test078-persistent-sessionlog
@@ -189,7 +189,7 @@ PORT=`eval echo '$PORT'$n`
 echo "Starting server $n on TCP/IP port $PORT..."
 cd ${XDIR}${n}
 LOG=`eval echo '$LOG'$n`
-$SLAPD -F slapd.d -h $MYURI -d $LVL $TIMING > $LOG 2>&1 &
+$SLAPD -F slapd.d -h $MYURI -d $LVL > $LOG 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -374,9 +374,9 @@ cd ${XDIR}${n}
 LOG=`eval echo '$LOG'$n`
 echo "RESTART" >> $LOG
 #if test $n = 2; then
-#echo $SLAPD -F slapd.d -h $MYURI -d $LVL $TIMING
+#echo $SLAPD -F slapd.d -h $MYURI -d $LVL
 #else
-$SLAPD -F slapd.d -h $MYURI -d $LVL $TIMING > $LOG 2>&1 &
+$SLAPD -F slapd.d -h $MYURI -d $LVL > $LOG 2>&1 &
 #fi
 PID=$!
 if test $WAIT != 0 ; then