diff --git a/tests/test-known.t b/tests/test-known.t
--- a/tests/test-known.t
+++ b/tests/test-known.t
@@ -1,4 +1,4 @@
-  $ "$TESTDIR/hghave" serve || exit 80
+  $ "$TESTDIR/hghave" killdaemons || exit 80
 
 = Test the known() protocol function =
 
@@ -35,4 +35,5 @@ Test via HTTP:
   $ hg debugknown http://localhost:$HGPORT/
   
   $ cat error.log
+  $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
 
diff --git a/tests/test-mq-qclone-http.t b/tests/test-mq-qclone-http.t
--- a/tests/test-mq-qclone-http.t
+++ b/tests/test-mq-qclone-http.t
@@ -1,4 +1,4 @@
-  $ "$TESTDIR/hghave" serve || exit 80
+  $ "$TESTDIR/hghave" killdaemons || exit 80
 
 hide outer repo
   $ hg init
@@ -151,3 +151,6 @@ test --mq works and uses correct reposit
   [1]
   $ hg --cwd d log --mq --template '{rev} {desc|firstline}\n'
   0 b.patch
+
+  $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
+
diff --git a/tests/test-mq-qimport.t b/tests/test-mq-qimport.t
--- a/tests/test-mq-qimport.t
+++ b/tests/test-mq-qimport.t
@@ -1,4 +1,4 @@
-  $ "$TESTDIR/hghave" serve || exit 80
+  $ "$TESTDIR/hghave" killdaemons || exit 80
 
   $ cat > writelines.py <<EOF
   > import sys
@@ -278,3 +278,5 @@ check qimport phase:
   1: secret
 
   $ cd ..
+
+  $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
diff --git a/tests/test-phases-exchange.t b/tests/test-phases-exchange.t
--- a/tests/test-phases-exchange.t
+++ b/tests/test-phases-exchange.t
@@ -1,4 +1,4 @@
-  $ "$TESTDIR/hghave" serve || exit 80
+  $ "$TESTDIR/hghave" killdaemons || exit 80
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
@@ -1062,4 +1062,5 @@ 2. cloning publishing repository
   |
   o  0 public a-A - 054250a37db4
   
+  $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
 
diff --git a/tests/test-pull-http.t b/tests/test-pull-http.t
--- a/tests/test-pull-http.t
+++ b/tests/test-pull-http.t
@@ -1,4 +1,4 @@
-  $ "$TESTDIR/hghave" serve || exit 80
+  $ "$TESTDIR/hghave" killdaemons || exit 80
 
   $ hg init test
   $ cd test
@@ -49,7 +49,7 @@ serve errors
   >     hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
   >     cat hg.pid >> $DAEMON_PIDS
   >     hg --cwd ../test pull http://localhost:$HGPORT/
-  >     kill `cat hg.pid`
+  >     "$TESTDIR/killdaemons.py" hg.pid
   >     echo % serve errors
   >     cat errors.log
   > }
diff --git a/tests/test-push-http.t b/tests/test-push-http.t
--- a/tests/test-push-http.t
+++ b/tests/test-push-http.t
@@ -1,4 +1,4 @@
-  $ "$TESTDIR/hghave" serve || exit 80
+  $ "$TESTDIR/hghave" killdaemons || exit 80
 
   $ hg init test
   $ cd test