diff --git a/tests/scripts/test011-subtree-repl b/tests/scripts/test011-subtree-repl
index c7fbc1c7cc..bc6b4732b2 100755
--- a/tests/scripts/test011-subtree-repl
+++ b/tests/scripts/test011-subtree-repl
@@ -1,6 +1,9 @@
 #! /bin/sh
 # $OpenLDAP$
 
+echo "Test disabled."
+exit 0
+
 SRCDIR="."
 if test $# -ge 1 ; then
 	SRCDIR=$1; shift
diff --git a/tests/scripts/test012-glue b/tests/scripts/test012-glue
index 7012c131d0..d820cb67d3 100755
--- a/tests/scripts/test012-glue
+++ b/tests/scripts/test012-glue
@@ -53,6 +53,8 @@ done
 cd ..
 
 kill -HUP $PID
+echo "Sleeping for 5 seconds to let slapd exit..."
+sleep 5
 
 if test $RC != 0 ; then
 	echo "ldapsearch failed ($RC)!"