diff --git a/tests/test-backwards-remove b/tests/test-backwards-remove
--- a/tests/test-backwards-remove
+++ b/tests/test-backwards-remove
@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/sh
 hg init
 echo This is file a1 > a
 hg add a
diff --git a/tests/test-bad-pull b/tests/test-bad-pull
--- a/tests/test-bad-pull
+++ b/tests/test-bad-pull
@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/sh
 
 hg clone http://localhost:20059/ copy
 echo $?
@@ -17,12 +17,9 @@ signal.signal(signal.SIGTERM, lambda x: 
 run()
 EOF
 
-set +x # backgrounding sometimes disturbs the order of command tracing
 python dumb.py 2>/dev/null &
-set -x
 
 hg clone http://localhost:20059/foo copy2
 echo $?
 
-set +x
 kill $!
diff --git a/tests/test-basic b/tests/test-basic
--- a/tests/test-basic
+++ b/tests/test-basic
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-set -x
 mkdir t
 cd t
 hg init
diff --git a/tests/test-clone b/tests/test-clone
--- a/tests/test-clone
+++ b/tests/test-clone
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-set -x
 mkdir a
 cd a
 hg init
diff --git a/tests/test-clone-failure b/tests/test-clone-failure
--- a/tests/test-clone-failure
+++ b/tests/test-clone-failure
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -x
-
 # No local source
 hg clone a b
 echo $?
diff --git a/tests/test-conflict b/tests/test-conflict
--- a/tests/test-conflict
+++ b/tests/test-conflict
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-set -x
 hg init
 echo "nothing" > a
 hg add a
@@ -10,7 +9,7 @@ hg commit -m branch1 -d "0 0"
 hg co 0
 echo "something else" > a
 hg commit -m branch2 -d "0 0"
-export HGMERGE=merge
+HGMERGE=merge; export HGMERGE
 hg up -m 1
 hg id
 grep -Ev ">>>|<<<" a
diff --git a/tests/test-copy b/tests/test-copy
--- a/tests/test-copy
+++ b/tests/test-copy
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-set -x
 hg init
 echo a > a
 hg add a
@@ -12,7 +11,7 @@ hg status
 hg --debug commit -m "2" -d "0 0"
 hg history
 hg log a
-hexdump -C .hg/data/b.d
+md5sum .hg/data/b.d
 hg cat b > bsum
 md5sum bsum
 hg cat a > asum
diff --git a/tests/test-diffdir b/tests/test-diffdir
--- a/tests/test-diffdir
+++ b/tests/test-diffdir
@@ -7,6 +7,6 @@ hg ci -m "a" -d "0 0"
 
 echo 123 > b
 hg add b
-hg diff | sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/"
+hg diff | sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/"
 
-hg diff -r tip | sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/"
+hg diff -r tip | sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/"
diff --git a/tests/test-flags b/tests/test-flags
--- a/tests/test-flags
+++ b/tests/test-flags
@@ -1,4 +1,4 @@
-#!/bin/sh -ex
+#!/bin/sh -e
 
 umask 027
 mkdir test1
diff --git a/tests/test-hook b/tests/test-hook
--- a/tests/test-hook
+++ b/tests/test-hook
@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/sh
 
 hg init
 echo "[hooks]" > .hg/hgrc
diff --git a/tests/test-merge-revert b/tests/test-merge-revert
--- a/tests/test-merge-revert
+++ b/tests/test-merge-revert
@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/sh
 
 mkdir t
 cd t
diff --git a/tests/test-merge-revert2 b/tests/test-merge-revert2
--- a/tests/test-merge-revert2
+++ b/tests/test-merge-revert2
@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/sh
 
 mkdir t
 cd t
@@ -26,7 +26,7 @@ hg id
 hg update -C 0
 echo "changed file1 different" >> file1
 HGMERGE=merge hg update
-hg diff | sed -e "s/\(\(---\|+++\).*\)\t.*/\1/" -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/"
+hg diff | sed -e "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/"
 hg status
 hg id
 hg revert
diff --git a/tests/test-merge1 b/tests/test-merge1
--- a/tests/test-merge1
+++ b/tests/test-merge1
@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/sh
 
 cat <<'EOF' > merge
 #!/bin/sh
diff --git a/tests/test-merge2 b/tests/test-merge2
--- a/tests/test-merge2
+++ b/tests/test-merge2
@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/sh
 
 mkdir t
 cd t
diff --git a/tests/test-merge3 b/tests/test-merge3
--- a/tests/test-merge3
+++ b/tests/test-merge3
@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/sh
 
 hg init
 echo This is file a1 > a
diff --git a/tests/test-merge4 b/tests/test-merge4
--- a/tests/test-merge4
+++ b/tests/test-merge4
@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/sh
 
 hg init
 echo This is file a1 > a
diff --git a/tests/test-merge5 b/tests/test-merge5
--- a/tests/test-merge5
+++ b/tests/test-merge5
@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/sh
 
 mkdir t
 cd t
diff --git a/tests/test-merge6 b/tests/test-merge6
--- a/tests/test-merge6
+++ b/tests/test-merge6
@@ -1,11 +1,11 @@
-#!/bin/sh -x
+#!/bin/sh
 
 cat <<'EOF' > merge
 #!/bin/sh
 echo merging for `basename $1`
 EOF
 chmod +x merge
-export HGMERGE=./merge
+HGMERGE=./merge; export HGMERGE
 
 mkdir A1
 cd A1
diff --git a/tests/test-rawcommit1 b/tests/test-rawcommit1
--- a/tests/test-rawcommit1
+++ b/tests/test-rawcommit1
@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/sh
 hg --debug init
 echo this is a1 > a
 hg add a
diff --git a/tests/test-simple-update b/tests/test-simple-update
--- a/tests/test-simple-update
+++ b/tests/test-simple-update
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -ex
+set -e
 
 mkdir test
 cd test
diff --git a/tests/test-tag b/tests/test-tag
--- a/tests/test-tag
+++ b/tests/test-tag
@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/sh
 
 hg init
 echo a > a
diff --git a/tests/test-tags b/tests/test-tags
--- a/tests/test-tags
+++ b/tests/test-tags
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-set -x
 mkdir t
 cd t
 hg init
diff --git a/tests/test-undo b/tests/test-undo
--- a/tests/test-undo
+++ b/tests/test-undo
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-set -x
 mkdir t
 cd t
 hg init
diff --git a/tests/test-up-local-change b/tests/test-up-local-change
--- a/tests/test-up-local-change
+++ b/tests/test-up-local-change
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -ex
+set -e
 mkdir r1
 cd r1
 hg init
@@ -13,7 +13,7 @@ cd ../r2
 hg up
 echo abc > a
 hg diff > ../d
-sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" < ../d
+sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d
 
 cd ../r1
 echo b > b
@@ -29,5 +29,5 @@ hg --debug up -m
 hg parents
 hg -v history
 hg diff > ../d
-sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" < ../d
+sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d