diff --git a/tests/test-hup.t b/tests/test-hup.t
--- a/tests/test-hup.t
+++ b/tests/test-hup.t
@@ -3,7 +3,7 @@ Test hangup signal in the middle of tran
   $ "$TESTDIR/hghave" serve fifo || exit 80
   $ hg init
   $ mkfifo p
-  $ hg serve --stdio < p &
+  $ hg serve --stdio < p 1>out 2>&1 &
   $ P=$!
 
 Do test while holding fifo open
@@ -11,10 +11,12 @@ Do test while holding fifo open
   $ (
   > echo lock
   > echo addchangegroup
-  > while [ ! -e .hg/store/00changelog.i.a ]; do true; done
+  > while [ ! -s .hg/store/journal ]; do true; done
   > kill -HUP $P
-  > while kill -0 $P 2>/dev/null; do true; done
   > ) > p
+
+  $ while kill -0 $P 2>/dev/null; do true; done
+  $ cat out
   0
   0
   adding changesets