--- a/tests/test-pull
+++ b/tests/test-pull
@@ -7,8 +7,7 @@ hg init
 hg addremove
 hg commit -m 1
 hg verify
-hg serve -p 20059 > /dev/null &
-sleep 1 # wait for server to be started
+hg serve -p 20059 -d --pid-file=hg.pid
 cd ..
 
 http_proxy= hg clone http://localhost:20059/ copy
@@ -19,4 +18,4 @@ cat foo
 hg manifest
 hg pull
 
-kill $!
+kill `cat ../test/hg.pid`