diff --git a/tests/test-audit-path.t b/tests/test-audit-path.t
--- a/tests/test-audit-path.t
+++ b/tests/test-audit-path.t
@@ -2,7 +2,8 @@ The simple store doesn't escape paths ro
 with periods, etc. So much of this test fails with it.
 #require no-reposimplestore
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
 audit of .hg
 
diff --git a/tests/test-backwards-remove.t b/tests/test-backwards-remove.t
--- a/tests/test-backwards-remove.t
+++ b/tests/test-backwards-remove.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo This is file a1 > a
   $ hg add a
   $ hg commit -m "commit #0"
diff --git a/tests/test-bisect.t b/tests/test-bisect.t
--- a/tests/test-bisect.t
+++ b/tests/test-bisect.t
@@ -1,5 +1,5 @@
-  $ hg init
-
+  $ hg init repo
+  $ cd repo
 
 committing changes
 
@@ -460,7 +460,7 @@ assuming that the shell returns 127 if c
 
 test bisecting command
 
-  $ cat > script.py <<EOF
+  $ cat > "$TESTTMP/script.py" <<EOF
   > #!$PYTHON
   > import sys
   > from mercurial import hg, ui as uimod
@@ -468,7 +468,7 @@ test bisecting command
   > if repo[b'.'].rev() < 6:
   >     sys.exit(1)
   > EOF
-  $ chmod +x script.py
+  $ chmod +x "$TESTTMP/script.py"
   $ hg bisect -r
   $ hg up -qr tip
   $ hg bisect --command "\"$PYTHON\" \"$TESTTMP/script.py\" and some parameters"
@@ -497,7 +497,7 @@ command
 
   $ hg update null
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ cat > script.sh <<'EOF'
+  $ cat > "$TESTTMP/script.sh" <<'EOF'
   > #!/bin/sh
   > test -n "$HG_NODE" || (echo HG_NODE missing; exit 127)
   > current="`hg log -r \"bisect(current)\" --template {node}`"
@@ -505,7 +505,7 @@ command
   > rev="`hg log -r $HG_NODE --template {rev}`"
   > test "$rev" -ge 6
   > EOF
-  $ chmod +x script.sh
+  $ chmod +x "$TESTTMP/script.sh"
   $ hg bisect -r
   $ hg bisect --good tip --noupdate
   $ hg bisect --bad 0 --noupdate
@@ -530,7 +530,7 @@ ensure that we still don't have a workin
 
 test the same case, this time with updating
 
-  $ cat > script.sh <<'EOF'
+  $ cat > "$TESTTMP/script.sh" <<'EOF'
   > #!/bin/sh
   > test -n "$HG_NODE" || (echo HG_NODE missing; exit 127)
   > current="`hg log -r \"bisect(current)\" --template {node}`"
@@ -538,7 +538,7 @@ test the same case, this time with updat
   > rev="`hg log -r . --template {rev}`"
   > test "$rev" -ge 6
   > EOF
-  $ chmod +x script.sh
+  $ chmod +x "$TESTTMP/script.sh"
   $ hg bisect -r
   $ hg up -qr tip
   $ hg bisect --command "sh \"$TESTTMP/script.sh\" and some params"
diff --git a/tests/test-bookmarks-current.t b/tests/test-bookmarks-current.t
--- a/tests/test-bookmarks-current.t
+++ b/tests/test-bookmarks-current.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
 no bookmarks
 
diff --git a/tests/test-bookmarks-merge.t b/tests/test-bookmarks-merge.t
--- a/tests/test-bookmarks-merge.t
+++ b/tests/test-bookmarks-merge.t
@@ -1,6 +1,7 @@
 # init
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo a > a
   $ hg add a
   $ hg commit -m'a'
diff --git a/tests/test-bookmarks-rebase.t b/tests/test-bookmarks-rebase.t
--- a/tests/test-bookmarks-rebase.t
+++ b/tests/test-bookmarks-rebase.t
@@ -3,7 +3,8 @@
 
 initialize repository
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ echo 'a' > a
   $ hg ci -A -m "0"
@@ -38,7 +39,7 @@ rebase
 
   $ hg rebase -s two -d one
   rebasing 3:2ae46b1d99a7 two tip "3"
-  saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg
 
   $ hg log
   changeset:   3:42e5ed2cdcf4
diff --git a/tests/test-cat.t b/tests/test-cat.t
--- a/tests/test-cat.t
+++ b/tests/test-cat.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo 0 > a
   $ echo 0 > b
   $ hg ci -A -m m
diff --git a/tests/test-clone-update-order.t b/tests/test-clone-update-order.t
--- a/tests/test-clone-update-order.t
+++ b/tests/test-clone-update-order.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo foo > bar
   $ hg commit -Am default
   adding bar
diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t
--- a/tests/test-commit-amend.t
+++ b/tests/test-commit-amend.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
 Setup:
 
@@ -36,7 +37,7 @@ Amending changeset with changes in worki
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -m 'amend base1'
   pretxncommit 43f1ba15f28a50abf0aae529cf8a16bfced7b149
   43f1ba15f28a tip
-  saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-5ab4f721-amend.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/489edb5b847d-5ab4f721-amend.hg
   $ echo 'pretxncommit.foo = ' >> $HGRCPATH
   $ hg diff -c .
   diff -r ad120869acf0 -r 43f1ba15f28a a
@@ -94,7 +95,7 @@ the amend, there should be no rollback.
 
 Add new file along with modified existing file:
   $ hg ci --amend -m 'amend base1 new file'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-007467c2-amend.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/43f1ba15f28a-007467c2-amend.hg
 
 Remove file that was added in amended commit:
 (and test logfile option)
@@ -103,7 +104,7 @@ Remove file that was added in amended co
   $ hg rm b
   $ echo 'amend base1 remove new file' > ../logfile
   $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg ci --amend --logfile ../logfile
-  saved backup bundle to $TESTTMP/.hg/strip-backup/c16295aaf401-1ada9901-amend.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/c16295aaf401-1ada9901-amend.hg
 
   $ hg cat b
   b: no such file in rev 47343646fa3d
@@ -123,7 +124,7 @@ No changes, just a different message:
        254 (changelog)
        163 (manifests)
        131  a
-  saved backup bundle to $TESTTMP/.hg/strip-backup/47343646fa3d-c2758885-amend.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/47343646fa3d-c2758885-amend.hg
   1 changesets found
   uncompressed size of bundle content:
        250 (changelog)
@@ -170,10 +171,10 @@ Test -u/-d:
   > EOF
   $ HGEDITOR="sh .hg/checkeditform.sh" hg ci --amend -u foo -d '1 0'
   HGEDITFORM=commit.amend.normal
-  saved backup bundle to $TESTTMP/.hg/strip-backup/401431e913a1-5e8e532c-amend.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/401431e913a1-5e8e532c-amend.hg
   $ echo a >> a
   $ hg ci --amend -u foo -d '1 0'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/d96b1d28ae33-677e0afb-amend.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d96b1d28ae33-677e0afb-amend.hg
   $ hg log -r .
   changeset:   1:a9a13940fc03
   tag:         tip
@@ -267,7 +268,7 @@ then, test editing custom commit message
        249 (changelog)
        163 (manifests)
        133  a
-  saved backup bundle to $TESTTMP/.hg/strip-backup/a9a13940fc03-7c2e8674-amend.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a9a13940fc03-7c2e8674-amend.hg
   1 changesets found
   uncompressed size of bundle content:
        257 (changelog)
@@ -303,7 +304,7 @@ Same, but with changes in working dir (d
        257 (changelog)
        163 (manifests)
        133  a
-  saved backup bundle to $TESTTMP/.hg/strip-backup/64a124ba1b44-10374b8f-amend.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/64a124ba1b44-10374b8f-amend.hg
   1 changesets found
   uncompressed size of bundle content:
        257 (changelog)
@@ -330,13 +331,13 @@ Moving bookmarks, preserve active bookma
   $ hg book book1
   $ hg book book2
   $ hg ci --amend -m 'move bookmarks'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/7892795b8e38-3fb46217-amend.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/7892795b8e38-3fb46217-amend.hg
   $ hg book
      book1                     1:8311f17e2616
    * book2                     1:8311f17e2616
   $ echo a >> a
   $ hg ci --amend -m 'move bookmarks'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/8311f17e2616-f0504fe3-amend.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/8311f17e2616-f0504fe3-amend.hg
   $ hg book
      book1                     1:a3b65065808c
    * book2                     1:a3b65065808c
@@ -370,7 +371,7 @@ Moving branches:
   $ hg branch default -f
   marked working directory as branch default
   $ hg ci --amend -m 'back to default'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/f8339a38efe1-c18453c9-amend.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/f8339a38efe1-c18453c9-amend.hg
   $ hg branches
   default                        2:9c07515f2650
 
@@ -386,7 +387,7 @@ Close branch:
   $ echo b >> b
   $ hg ci -mb
   $ hg ci --amend --close-branch -m 'closing branch foo'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/c962248fa264-54245dc7-amend.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/c962248fa264-54245dc7-amend.hg
 
 Same thing, different code path:
 
@@ -395,7 +396,7 @@ Same thing, different code path:
   reopening closed branch head 4
   $ echo b >> b
   $ hg ci --amend --close-branch
-  saved backup bundle to $TESTTMP/.hg/strip-backup/027371728205-b900d9fa-amend.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/027371728205-b900d9fa-amend.hg
   $ hg branches
   default                        2:9c07515f2650
 
@@ -433,7 +434,7 @@ Follow copies/renames:
   $ hg ci -m 'b -> c'
   $ hg mv c d
   $ hg ci --amend -m 'b -> d'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/42f3f27a067d-f23cc9f7-amend.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/42f3f27a067d-f23cc9f7-amend.hg
   $ hg st --rev '.^' --copies d
   A d
     b
@@ -441,7 +442,7 @@ Follow copies/renames:
   $ hg ci -m 'e = d'
   $ hg cp e f
   $ hg ci --amend -m 'f = d'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/9198f73182d5-251d584a-amend.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9198f73182d5-251d584a-amend.hg
   $ hg st --rev '.^' --copies f
   A f
     d
@@ -452,7 +453,7 @@ Follow copies/renames:
   $ hg cp a f
   $ mv f.orig f
   $ hg ci --amend -m replacef
-  saved backup bundle to $TESTTMP/.hg/strip-backup/f0993ab6b482-eda301bf-amend.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/f0993ab6b482-eda301bf-amend.hg
   $ hg st --change . --copies
   $ hg log -r . --template "{file_copies}\n"
   
@@ -464,7 +465,7 @@ Move added file (issue3410):
   adding g
   $ hg mv g h
   $ hg ci --amend
-  saved backup bundle to $TESTTMP/.hg/strip-backup/58585e3f095c-0f5ebcda-amend.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/58585e3f095c-0f5ebcda-amend.hg
   $ hg st --change . --copies h
   A h
   $ hg log -r . --template "{file_copies}\n"
@@ -484,11 +485,11 @@ Preserve extra dict (issue3430):
   $ echo a >> a
   $ hg ci -ma
   $ hg ci --amend -m "a'"
-  saved backup bundle to $TESTTMP/.hg/strip-backup/39a162f1d65e-9dfe13d8-amend.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/39a162f1d65e-9dfe13d8-amend.hg
   $ hg log -r . --template "{branch}\n"
   a
   $ hg ci --amend -m "a''"
-  saved backup bundle to $TESTTMP/.hg/strip-backup/d5ca7b1ac72b-0b4c1a34-amend.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d5ca7b1ac72b-0b4c1a34-amend.hg
   $ hg log -r . --template "{branch}\n"
   a
 
@@ -505,7 +506,7 @@ first graft something so there's an addi
   $ hg graft 12
   grafting 12:2647734878ef "fork" (tip)
   $ hg ci --amend -m 'graft amend'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/fe8c6f7957ca-25638666-amend.hg
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fe8c6f7957ca-25638666-amend.hg
   $ hg log -r . --debug | grep extra
   extra:       amend_source=fe8c6f7957ca1665ed77496ed7a07657d469ac60
   extra:       branch=a
diff --git a/tests/test-conflict.t b/tests/test-conflict.t
--- a/tests/test-conflict.t
+++ b/tests/test-conflict.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ cat << EOF > a
   > Small Mathematical Series.
   > One
diff --git a/tests/test-confused-revert.t b/tests/test-confused-revert.t
--- a/tests/test-confused-revert.t
+++ b/tests/test-confused-revert.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo foo > a
   $ hg add a
   $ hg commit -m "1"
diff --git a/tests/test-custom-filters.t b/tests/test-custom-filters.t
--- a/tests/test-custom-filters.t
+++ b/tests/test-custom-filters.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ cat > .hg/hgrc <<EOF
   > [extensions]
diff --git a/tests/test-debugrename.t b/tests/test-debugrename.t
--- a/tests/test-debugrename.t
+++ b/tests/test-debugrename.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo a > a
   $ hg ci -Am t
   adding a
diff --git a/tests/test-diff-ignore-whitespace.t b/tests/test-diff-ignore-whitespace.t
--- a/tests/test-diff-ignore-whitespace.t
+++ b/tests/test-diff-ignore-whitespace.t
@@ -5,7 +5,8 @@ Prepare tests:
   $ echo '[alias]' >> $HGRCPATH
   $ echo 'ndiff = diff --nodates' >> $HGRCPATH
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ printf 'hello world\ngoodbye world\n' >foo
   $ hg ci -Amfoo -ufoo
   adding foo
diff --git a/tests/test-diff-indent-heuristic.t b/tests/test-diff-indent-heuristic.t
--- a/tests/test-diff-indent-heuristic.t
+++ b/tests/test-diff-indent-heuristic.t
@@ -8,7 +8,8 @@
   > EOF
 #endif
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ cat > a.c <<'EOF'
   > /*
diff --git a/tests/test-diff-issue2761.t b/tests/test-diff-issue2761.t
--- a/tests/test-diff-issue2761.t
+++ b/tests/test-diff-issue2761.t
@@ -1,6 +1,7 @@
 Test issue2761
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ touch to-be-deleted
   $ hg add
diff --git a/tests/test-diff-newlines.t b/tests/test-diff-newlines.t
--- a/tests/test-diff-newlines.t
+++ b/tests/test-diff-newlines.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ "$PYTHON" -c 'open("a", "wb").write(b"confuse str.splitlines\nembedded\rnewline\n")'
   $ hg ci -Ama -d '1 0'
diff --git a/tests/test-diff-reverse.t b/tests/test-diff-reverse.t
--- a/tests/test-diff-reverse.t
+++ b/tests/test-diff-reverse.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ cat > a <<EOF
   > a
diff --git a/tests/test-editor-filename.t b/tests/test-editor-filename.t
--- a/tests/test-editor-filename.t
+++ b/tests/test-editor-filename.t
@@ -1,6 +1,7 @@
 Test temp file used with an editor has the expected suffix.
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
 Create an editor that writes its arguments to stdout and set it to $HGEDITOR.
 
@@ -9,7 +10,7 @@ Create an editor that writes its argumen
   > exit 1
   > EOF
   $ hg add editor.sh
-  $ HGEDITOR="sh $TESTTMP/editor.sh"
+  $ HGEDITOR="sh $TESTTMP/repo/editor.sh"
   $ export HGEDITOR
 
 Verify that the path for a commit editor has the expected suffix.
diff --git a/tests/test-encode.t b/tests/test-encode.t
--- a/tests/test-encode.t
+++ b/tests/test-encode.t
@@ -1,6 +1,7 @@
 Test encode/decode filters
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ cat > .hg/hgrc <<EOF
   > [encode]
   > not.gz = tr [:lower:] [:upper:]
diff --git a/tests/test-execute-bit.t b/tests/test-execute-bit.t
--- a/tests/test-execute-bit.t
+++ b/tests/test-execute-bit.t
@@ -1,6 +1,7 @@
 #require execbit
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo a > a
   $ hg ci -Am'not executable'
   adding a
diff --git a/tests/test-extra-filelog-entry.t b/tests/test-extra-filelog-entry.t
--- a/tests/test-extra-filelog-entry.t
+++ b/tests/test-extra-filelog-entry.t
@@ -3,7 +3,8 @@ Issue351: mq: qrefresh can create extra 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ hg qinit
 
   $ echo b > b
diff --git a/tests/test-fileset-generated.t b/tests/test-fileset-generated.t
--- a/tests/test-fileset-generated.t
+++ b/tests/test-fileset-generated.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
 Set up history and working copy
 
diff --git a/tests/test-git-export.t b/tests/test-git-export.t
--- a/tests/test-git-export.t
+++ b/tests/test-git-export.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo start > start
   $ hg ci -Amstart
   adding start
@@ -46,7 +47,7 @@ Copy:
 Cross and same-directory copies with a relative root:
 
   $ hg diff --git --root .. -r 1:tip
-  abort: .. not under root '$TESTTMP'
+  abort: .. not under root '$TESTTMP/repo'
   [255]
   $ hg diff --git --root doesnotexist -r 1:tip
   $ hg diff --git --root . -r 1:tip
@@ -121,7 +122,7 @@ Cross and same-directory copies with a r
   +copy2
 
   $ hg diff --git --root ../.. -r 1:tip
-  abort: ../.. not under root '$TESTTMP'
+  abort: ../.. not under root '$TESTTMP/repo'
   [255]
   $ hg diff --git --root ../doesnotexist -r 1:tip
   $ hg diff --git --root .. -r 1:tip
diff --git a/tests/test-issue1089.t b/tests/test-issue1089.t
--- a/tests/test-issue1089.t
+++ b/tests/test-issue1089.t
@@ -1,6 +1,7 @@
 https://bz.mercurial-scm.org/1089
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ mkdir a
   $ echo a > a/b
   $ hg ci -Am m
diff --git a/tests/test-issue1175.t b/tests/test-issue1175.t
--- a/tests/test-issue1175.t
+++ b/tests/test-issue1175.t
@@ -1,6 +1,7 @@
 https://bz.mercurial-scm.org/1175
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ touch a
   $ hg ci -Am0
   adding a
diff --git a/tests/test-issue1438.t b/tests/test-issue1438.t
--- a/tests/test-issue1438.t
+++ b/tests/test-issue1438.t
@@ -2,7 +2,8 @@
 
 https://bz.mercurial-scm.org/1438
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ ln -s foo link
   $ hg add link
diff --git a/tests/test-issue522.t b/tests/test-issue522.t
--- a/tests/test-issue522.t
+++ b/tests/test-issue522.t
@@ -6,7 +6,8 @@ the version in p1 is an ancestor of the 
 sure that we'll use the version from p2 in the manifest of the merge
 revision.
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ echo foo > foo
   $ hg ci -qAm 'add foo'
diff --git a/tests/test-issue612.t b/tests/test-issue612.t
--- a/tests/test-issue612.t
+++ b/tests/test-issue612.t
@@ -1,6 +1,7 @@
 https://bz.mercurial-scm.org/612
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ mkdir src
   $ echo a > src/a.c
   $ hg ci -Ama
diff --git a/tests/test-issue619.t b/tests/test-issue619.t
--- a/tests/test-issue619.t
+++ b/tests/test-issue619.t
@@ -1,6 +1,7 @@
 https://bz.mercurial-scm.org/619
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo a > a
   $ hg ci -Ama
   adding a
diff --git a/tests/test-issue672.t b/tests/test-issue672.t
--- a/tests/test-issue672.t
+++ b/tests/test-issue672.t
@@ -6,7 +6,8 @@ https://bz.mercurial-scm.org/672
 #
 # rename in #1, content change in #4.
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ touch 1
   $ touch 2
diff --git a/tests/test-issue842.t b/tests/test-issue842.t
--- a/tests/test-issue842.t
+++ b/tests/test-issue842.t
@@ -1,6 +1,7 @@
 https://bz.mercurial-scm.org/842
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo foo > a
   $ hg ci -Ama
   adding a
diff --git a/tests/test-journal-exists.t b/tests/test-journal-exists.t
--- a/tests/test-journal-exists.t
+++ b/tests/test-journal-exists.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo a > a
   $ hg ci -Am0
   adding a
@@ -52,7 +53,7 @@ Check that zero-size journals are correc
 
   $ hg -R foo unbundle repo.hg
   adding changesets
-  abort: Permission denied: '$TESTTMP/foo/.hg/store/.00changelog.i-*' (glob)
+  abort: Permission denied: '$TESTTMP/repo/foo/.hg/store/.00changelog.i-*' (glob)
   [255]
 
   $ if test -f foo/.hg/store/journal; then echo 'journal exists :-('; fi
diff --git a/tests/test-legacy-exit-code.t b/tests/test-legacy-exit-code.t
--- a/tests/test-legacy-exit-code.t
+++ b/tests/test-legacy-exit-code.t
@@ -6,7 +6,8 @@ enabled.
   > detailed-exit-code=no
   > EOF
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo a > a
 Expect exit code 0 on success
   $ hg ci -Aqm initial
diff --git a/tests/test-log-linerange.t b/tests/test-log-linerange.t
--- a/tests/test-log-linerange.t
+++ b/tests/test-log-linerange.t
@@ -3,7 +3,8 @@
   > git = true
   > EOF
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ cat > foo << EOF
   > 0
   > 1
diff --git a/tests/test-merge-default.t b/tests/test-merge-default.t
--- a/tests/test-merge-default.t
+++ b/tests/test-merge-default.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo a > a
   $ hg commit -A -ma
   adding a
diff --git a/tests/test-merge-internal-tools-pattern.t b/tests/test-merge-internal-tools-pattern.t
--- a/tests/test-merge-internal-tools-pattern.t
+++ b/tests/test-merge-internal-tools-pattern.t
@@ -6,7 +6,8 @@ Make sure HGMERGE doesn't interfere with
 
   $ unset HGMERGE
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
 Initial file contents:
 
diff --git a/tests/test-merge-local.t b/tests/test-merge-local.t
--- a/tests/test-merge-local.t
+++ b/tests/test-merge-local.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
 Revision 0:
 
diff --git a/tests/test-merge-remove.t b/tests/test-merge-remove.t
--- a/tests/test-merge-remove.t
+++ b/tests/test-merge-remove.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ echo foo > foo
   $ echo bar > bar
diff --git a/tests/test-merge-revert.t b/tests/test-merge-revert.t
--- a/tests/test-merge-revert.t
+++ b/tests/test-merge-revert.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ echo "added file1" > file1
   $ echo "added file2" > file2
diff --git a/tests/test-merge-revert2.t b/tests/test-merge-revert2.t
--- a/tests/test-merge-revert2.t
+++ b/tests/test-merge-revert2.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ echo "added file1" > file1
   $ echo "another line of text" >> file1
diff --git a/tests/test-merge-subrepos.t b/tests/test-merge-subrepos.t
--- a/tests/test-merge-subrepos.t
+++ b/tests/test-merge-subrepos.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ echo a > a
   $ hg ci -qAm 'add a'
diff --git a/tests/test-merge4.t b/tests/test-merge4.t
--- a/tests/test-merge4.t
+++ b/tests/test-merge4.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo This is file a1 > a
   $ hg add a
   $ hg commit -m "commit #0"
diff --git a/tests/test-merge5.t b/tests/test-merge5.t
--- a/tests/test-merge5.t
+++ b/tests/test-merge5.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ echo This is file a1 > a
   $ echo This is file b1 > b
   $ hg add a b
diff --git a/tests/test-mq-guards.t b/tests/test-mq-guards.t
--- a/tests/test-mq-guards.t
+++ b/tests/test-mq-guards.t
@@ -1,7 +1,8 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ hg qinit
 
   $ echo x > x
diff --git a/tests/test-mq-qsave.t b/tests/test-mq-qsave.t
--- a/tests/test-mq-qsave.t
+++ b/tests/test-mq-qsave.t
@@ -1,7 +1,8 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ echo 'base' > base
   $ hg ci -Ambase
diff --git a/tests/test-mq-symlinks.t b/tests/test-mq-symlinks.t
--- a/tests/test-mq-symlinks.t
+++ b/tests/test-mq-symlinks.t
@@ -3,7 +3,8 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ hg qinit
   $ hg qnew base.patch
   $ echo aaa > a
diff --git a/tests/test-paths.t b/tests/test-paths.t
--- a/tests/test-paths.t
+++ b/tests/test-paths.t
@@ -238,11 +238,6 @@ Testing path referencing other paths
 basic setup
 -----------
 
-  $ ls -1
-  a
-  b
-  gpath1
-  suboptions
   $ hg init chained_path
   $ cd chained_path
   $ cat << EOF > .hg/hgrc
diff --git a/tests/test-rename-merge1.t b/tests/test-rename-merge1.t
--- a/tests/test-rename-merge1.t
+++ b/tests/test-rename-merge1.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ echo "[merge]" >> .hg/hgrc
   $ echo "followcopies = 1" >> .hg/hgrc
diff --git a/tests/test-rename.t b/tests/test-rename.t
--- a/tests/test-rename.t
+++ b/tests/test-rename.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ mkdir d1 d1/d11 d2
   $ echo d1/a > d1/a
   $ echo d1/ba > d1/ba
@@ -613,7 +614,7 @@ check illegal path components
   [10]
   $ hg status -C
   $ hg rename d1/d11/a1 ../foo
-  abort: ../foo not under root '$TESTTMP'
+  abort: ../foo not under root '$TESTTMP/repo'
   [255]
   $ hg status -C
 
@@ -636,11 +637,11 @@ check illegal path components
   [10]
   $ hg status -C
   $ hg rename d1/d11/a1 ..
-  abort: ../a1 not under root '$TESTTMP'
+  abort: ../a1 not under root '$TESTTMP/repo'
   [255]
   $ hg --config extensions.largefiles= rename d1/d11/a1 ..
   The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
-  abort: ../a1 not under root '$TESTTMP'
+  abort: ../a1 not under root '$TESTTMP/repo'
   [255]
   $ hg status -C
 
@@ -659,7 +660,7 @@ check illegal path components
   [10]
   $ hg status -C
   $ (cd d1/d11; hg rename ../../d2/b ../../../foo)
-  abort: ../../../foo not under root '$TESTTMP'
+  abort: ../../../foo not under root '$TESTTMP/repo'
   [255]
   $ hg status -C
 
diff --git a/tests/test-revert-unknown.t b/tests/test-revert-unknown.t
--- a/tests/test-revert-unknown.t
+++ b/tests/test-revert-unknown.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ touch unknown
 
   $ touch a
diff --git a/tests/test-status-rev.t b/tests/test-status-rev.t
--- a/tests/test-status-rev.t
+++ b/tests/test-status-rev.t
@@ -1,7 +1,8 @@
 Tests of 'hg status --rev <rev>' to make sure status between <rev> and '.' get
 combined correctly with the dirstate status.
 
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
 First commit
 
diff --git a/tests/test-strict.t b/tests/test-strict.t
--- a/tests/test-strict.t
+++ b/tests/test-strict.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ echo a > a
   $ hg ci -Ama
diff --git a/tests/test-update-reverse.t b/tests/test-update-reverse.t
--- a/tests/test-update-reverse.t
+++ b/tests/test-update-reverse.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
 
   $ touch a
   $ hg add a
diff --git a/tests/test-username-newline.t b/tests/test-username-newline.t
--- a/tests/test-username-newline.t
+++ b/tests/test-username-newline.t
@@ -1,4 +1,5 @@
-  $ hg init
+  $ hg init repo
+  $ cd repo
   $ touch a
 
   $ unset HGUSER