diff -r ce844e8e8af2 -r 339a3fa19695 tests/test-serve.t
--- a/tests/test-serve.t	Sat Feb 09 13:35:45 2013 +0000
+++ b/tests/test-serve.t	Sat Feb 09 13:58:13 2013 +0000
@@ -9,12 +9,7 @@
   >    cat hg.pid >> "$DAEMON_PIDS"
   >    echo % errors
   >    cat errors.log
-  >    if [ "$KILLQUIETLY" = "Y" ]; then
-  >        kill `cat hg.pid` 2>/dev/null
-  >    else
-  >        kill `cat hg.pid`
-  >    fi
-  >    while kill -0 `cat hg.pid` 2>/dev/null; do sleep 0; done
+  >    "$TESTDIR/killdaemons.py" hg.pid
   > }
 
   $ hg init test