--- a/tests/test-archive
+++ b/tests/test-archive
@@ -18,8 +18,7 @@ echo "name = test-archive" >> .hg/hgrc
echo "allowzip = true" >> .hg/hgrc
echo "allowgz = true" >> .hg/hgrc
echo "allowbz2 = true" >> .hg/hgrc
-hg serve -p 20059 > /dev/null &
-sleep 1 # wait for server to be started
+hg serve -p 20059 -d --pid-file=hg.pid
TIP=`hg id -v | cut -f1 -d' '`
QTIP=`hg id -q`
@@ -35,5 +34,5 @@ http_proxy= python getarchive.py "$TIP"
http_proxy= python getarchive.py "$TIP" zip > archive.zip
unzip -t archive.zip | sed "s/$QTIP/TIP/"
-kill $!
+kill `cat hg.pid`
sleep 1 # wait for server to scream and die