diff --git a/tests/scripts/test000-rootdse b/tests/scripts/test000-rootdse
index fd10f7a0a3..54d075e732 100755
--- a/tests/scripts/test000-rootdse
+++ b/tests/scripts/test000-rootdse
@@ -10,6 +10,11 @@ if test $# -ge 1 ; then
 	BACKEND=$1; shift
 fi
 
+WAIT=0
+if test $# -ge 1 ; then
+	WAIT=1; shift
+fi
+
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
@@ -23,6 +28,10 @@ echo "Starting slapd on TCP/IP port $PORT..."
 . $CONFFILTER $BACKEND < $SCHEMACONF > $DBCONF
 $SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
+if test $WAIT != 0 ; then
+    echo PID $PID
+    read foo
+fi
 
 echo "Using ldapsearch to retrieve all the entries..."
 for i in 0 1 2 3 4 5; do
diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd
index b883d8050b..269829debc 100755
--- a/tests/scripts/test001-slapadd
+++ b/tests/scripts/test001-slapadd
@@ -9,6 +9,10 @@ BACKEND=ldbm
 if test $# -ge 1 ; then
 	BACKEND=$1; shift
 fi
+WAIT=0
+if test $# -ge 1 ; then
+	WAIT=1; shift
+fi
 
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
@@ -32,6 +36,10 @@ echo "Starting slapd on TCP/IP port $PORT..."
 . $CONFFILTER $BACKEND < $CONF > $DBCONF
 $SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
+if test $WAIT != 0 ; then
+    echo PID $PID
+    read foo
+fi
 
 echo "Using ldapsearch to retrieve all the entries..."
 for i in 0 1 2 3 4 5; do
@@ -59,6 +67,8 @@ $CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 
 if test $? != 0 ; then
 	echo "comparison failed - database was not created correctly"
+	echo $SEARCHFLT $LDIFFLT
+	diff -u $SEARCHFLT $LDIFFLT
 	exit 1
 fi
 
diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate
index c86c3e794a..d069e07536 100755
--- a/tests/scripts/test002-populate
+++ b/tests/scripts/test002-populate
@@ -9,6 +9,10 @@ BACKEND=ldbm
 if test $# -ge 1 ; then
 	BACKEND=$1; shift
 fi
+WAIT=0
+if test $# -ge 1 ; then
+	WAIT=1; shift
+fi
 
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
@@ -21,6 +25,10 @@ echo "Starting slapd on TCP/IP port $PORT..."
 . $CONFFILTER $BACKEND < $CONF > $DBCONF
 $SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
+if test $WAIT != 0 ; then
+    echo PID $PID
+    read foo
+fi
 
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search
index 68cd8fd107..c73254a863 100755
--- a/tests/scripts/test003-search
+++ b/tests/scripts/test003-search
@@ -9,6 +9,10 @@ BACKEND=ldbm
 if test $# -ge 1 ; then
 	BACKEND=$1; shift
 fi
+WAIT=0
+if test $# -ge 1 ; then
+	WAIT=1; shift
+fi
 
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
@@ -38,6 +42,10 @@ fi
 echo "Starting slapd on TCP/IP port $PORT..."
 $SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
+if test $WAIT != 0 ; then
+    echo PID $PID
+    read foo
+fi
 
 echo "Testing slapd searching..."
 for i in 0 1 2 3 4 5; do
diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify
index 2f8caae105..32427f08e8 100755
--- a/tests/scripts/test004-modify
+++ b/tests/scripts/test004-modify
@@ -9,6 +9,10 @@ BACKEND=ldbm
 if test $# -ge 1 ; then
 	BACKEND=$1; shift
 fi
+WAIT=0
+if test $# -ge 1 ; then
+	WAIT=1; shift
+fi
 
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
@@ -32,6 +36,10 @@ fi
 echo "Starting slapd on TCP/IP port $PORT..."
 $SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
+if test $WAIT != 0 ; then
+    echo PID $PID
+    read foo
+fi
 
 echo "Testing slapd modify operations..."
 for i in 0 1 2 3 4 5; do
diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn
index 11f2fca755..0accc7c4b3 100755
--- a/tests/scripts/test005-modrdn
+++ b/tests/scripts/test005-modrdn
@@ -9,6 +9,10 @@ BACKEND=ldbm
 if test $# -ge 1 ; then
 	BACKEND=$1; shift
 fi
+WAIT=0
+if test $# -ge 1 ; then
+	WAIT=1; shift
+fi
 
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
@@ -29,6 +33,10 @@ fi
 echo "Starting slapd on TCP/IP port $PORT..."
 $SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
+if test $WAIT != 0 ; then
+    echo PID $PID
+    read foo
+fi
 echo "Testing slapd modrdn operations..."
 
 # Make sure we can search the database
diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls
index ffcc43c320..5a97ccc531 100755
--- a/tests/scripts/test006-acls
+++ b/tests/scripts/test006-acls
@@ -9,6 +9,10 @@ BACKEND=ldbm
 if test $# -ge 1 ; then
 	BACKEND=$1; shift
 fi
+WAIT=0
+if test $# -ge 1 ; then
+	WAIT=1; shift
+fi
 
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
@@ -29,6 +33,10 @@ fi
 echo "Starting slapd on TCP/IP port $PORT..."
 $SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
+if test $WAIT != 0 ; then
+    echo PID $PID
+    read foo
+fi
 
 echo "Testing slapd access control..."
 for i in 0 1 2 3 4 5; do
diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication
index 850052f87d..e17a14f7f7 100755
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@@ -9,6 +9,10 @@ BACKEND=ldbm
 if test $# -ge 1 ; then
 	BACKEND=$1; shift
 fi
+WAIT=0
+if test $# -ge 1 ; then
+	WAIT=1; shift
+fi
 
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
@@ -38,11 +42,19 @@ echo "Starting master slapd on TCP/IP port $PORT..."
 . $CONFFILTER $BACKEND < $MASTERCONF > $DBCONF
 $SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
+if test $WAIT != 0 ; then
+    echo PID $PID
+    read foo
+fi
 
 echo "Starting slave slapd on TCP/IP port $SLAVEPORT..."
 . $CONFFILTER $BACKEND < $SLAVECONF > $REPLCONF
 $SLAPD -f $REPLCONF -h $SLAVEURI -d $LVL $TIMING > $SLAVELOG 2>&1 &
 SLAVEPID=$!
+if test $WAIT != 0 ; then
+    echo SLAVEPID $SLAVEPID
+    read foo
+fi
 
 echo "Using ldapsearch to check that master slapd is running..."
 for i in 0 1 2 3 4 5; do
diff --git a/tests/scripts/test008-concurrency b/tests/scripts/test008-concurrency
index a3ff6ae7b7..24f1722901 100755
--- a/tests/scripts/test008-concurrency
+++ b/tests/scripts/test008-concurrency
@@ -9,6 +9,10 @@ BACKEND=ldbm
 if test $# -ge 1 ; then
 	BACKEND=$1; shift
 fi
+WAIT=0
+if test $# -ge 1 ; then
+	WAIT=1; shift
+fi
 
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
@@ -34,6 +38,10 @@ sleep 5
 echo "Starting slapd on TCP/IP port $PORT..."
 $SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
+if test $WAIT != 0 ; then
+    echo PID $PID
+    read foo
+fi
 
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
diff --git a/tests/scripts/test009-referral b/tests/scripts/test009-referral
index 88f3e5bec3..09b47df877 100755
--- a/tests/scripts/test009-referral
+++ b/tests/scripts/test009-referral
@@ -9,6 +9,10 @@ BACKEND=ldbm
 if test $# -ge 1 ; then
 	BACKEND=$1; shift
 fi
+WAIT=0
+if test $# -ge 1 ; then
+	WAIT=1; shift
+fi
 
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
@@ -35,11 +39,19 @@ fi
 echo "Starting master slapd on TCP/IP port $PORT..."
 $SLAPD -n master -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
+if test $WAIT != 0 ; then
+    echo PID $PID
+    read foo
+fi
 
 echo "Starting slave slapd on TCP/IP port $SLAVEPORT..."
 . $CONFFILTER $BACKEND < $REFSLAVECONF > $REPLCONF
 $SLAPD -n slave -f $REPLCONF -h $SLAVEURI -d $LVL $TIMING > $SLAVELOG 2>&1 &
 SLAVEPID=$!
+if test $WAIT != 0 ; then
+    echo SLAVEPID $SLAVEPID
+    read foo
+fi
 
 echo "Testing for master slapd..."
 for i in 0 1 2 3 4 5; do
diff --git a/tests/scripts/test010-passwd b/tests/scripts/test010-passwd
index 593a2de8ad..080063c709 100755
--- a/tests/scripts/test010-passwd
+++ b/tests/scripts/test010-passwd
@@ -9,6 +9,10 @@ BACKEND=ldbm
 if test $# -ge 1 ; then
 	BACKEND=$1; shift
 fi
+WAIT=0
+if test $# -ge 1 ; then
+	WAIT=1; shift
+fi
 
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
@@ -21,6 +25,10 @@ echo "Starting slapd on TCP/IP port $PORT..."
 . $CONFFILTER $BACKEND < $PWCONF > $DBCONF
 $SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
+if test $WAIT != 0 ; then
+    echo PID $PID
+    read foo
+fi
 
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do