diff --git a/tests/filtertmp.py b/tests/filtertmp.py
--- a/tests/filtertmp.py
+++ b/tests/filtertmp.py
@@ -9,6 +9,7 @@
 import sys, os
 
 input = sys.stdin.read()
-input = input.replace(os.environ['HGTMP'], '$HGTMP')
 input = input.replace(os.sep, '/')
+hgtmp = os.environ['HGTMP'].replace(os.sep, '/')
+input = input.replace(hgtmp, '$HGTMP')
 sys.stdout.write(input)
diff --git a/tests/test-push-validation b/tests/test-push-validation
--- a/tests/test-push-validation
+++ b/tests/test-push-validation
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-STRIP=`pwd`
-
 hg init test
 cd test
 cat > .hg/hgrc <<EOF
@@ -21,4 +19,4 @@ cp .hg/store/data/beta.i tmp
 echo blah >> beta
 hg ci -m '2 (corrupt)'
 mv tmp .hg/store/data/beta.i
-hg push 2>&1 | sed "s%$STRIP%test-root%"
+hg push 2>&1 | "$TESTDIR/filtertmp.py"
diff --git a/tests/test-push-validation.out b/tests/test-push-validation.out
--- a/tests/test-push-validation.out
+++ b/tests/test-push-validation.out
@@ -2,7 +2,7 @@ adding alpha
 adding beta
 updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-pushing to test-root/test
+pushing to $HGTMP/test-push-validation/test
 searching for changes
 adding changesets
 adding manifests