diff --git a/tests/test-serve b/tests/test-serve
--- a/tests/test-serve
+++ b/tests/test-serve
@@ -5,8 +5,8 @@ cd test
 
 echo % Without -v
 hg serve -a localhost -p 20063 -d --pid-file=hg.pid
-kill `cat hg.pid`
+cat hg.pid >> "$DAEMON_PIDS"
 
 echo % With -v
-hg serve -a localhost -p 20063 -d --pid-file=hg.pid -v
-kill `cat hg.pid`
+hg serve -a localhost -p 20064 -d --pid-file=hg.pid -v
+cat hg.pid >> "$DAEMON_PIDS"
diff --git a/tests/test-serve.out b/tests/test-serve.out
--- a/tests/test-serve.out
+++ b/tests/test-serve.out
@@ -1,3 +1,3 @@
 % Without -v
 % With -v
-listening at http://localhost:20063/
+listening at http://localhost:20064/