diff --git a/tests/scripts/test030-relay b/tests/scripts/test030-relay
index 3164dca9e4..7f06f98e7f 100755
--- a/tests/scripts/test030-relay
+++ b/tests/scripts/test030-relay
@@ -89,8 +89,8 @@ for RELAY in $RELAYS ; do
 		if test $first = 1 ; then
 			first=0
 		else
-			echo ">>>>> waiting 10 seconds for things to exit"
-			sleep 10
+			echo ">>>>> waiting for things to exit"
+			test $KILLSERVERS != no && wait
 			echo ""
 	
 			rm -rf $TESTDIR