diff --git a/tests/test-notify-changegroup.t b/tests/test-notify-changegroup.t
--- a/tests/test-notify-changegroup.t
+++ b/tests/test-notify-changegroup.t
@@ -39,6 +39,7 @@ commit
 push
 
   $ hg --traceback --cwd b push ../a 2>&1 |
+  >     "$PYTHON" $TESTDIR/unwrap-message-id.py | \
   >     "$PYTHON" -c 'from __future__ import print_function ; import sys,re; print(re.sub("\n\t", " ", sys.stdin.read()), end="")'
   pushing to ../a
   searching for changes
@@ -93,6 +94,7 @@ unbundle with unrelated source
 unbundle with correct source
 
   $ hg --config notify.sources=unbundle --cwd a unbundle ../test.hg 2>&1 |
+  >     "$PYTHON" $TESTDIR/unwrap-message-id.py | \
   >     "$PYTHON" -c 'from __future__ import print_function ; import sys,re; print(re.sub("\n\t", " ", sys.stdin.read()), end="")'
   adding changesets
   adding manifests
@@ -169,6 +171,7 @@ merge as a different user
 push
 
   $ hg --traceback --cwd b --config notify.fromauthor=True push ../a 2>&1 |
+  >     "$PYTHON" $TESTDIR/unwrap-message-id.py | \
   >     "$PYTHON" -c 'from __future__ import print_function ; import sys,re; print(re.sub("\n\t", " ", sys.stdin.read()), end="")'
   pushing to ../a
   searching for changes