diff --git a/tests/test-backout.t b/tests/test-backout.t
--- a/tests/test-backout.t
+++ b/tests/test-backout.t
@@ -3,7 +3,7 @@
   $ hg init basic
   $ cd basic
 
-# should complain
+should complain
 
   $ hg backout
   abort: please specify a revision to backout
@@ -12,7 +12,7 @@
   abort: please specify just one revision
   [255]
 
-# basic operation
+basic operation
 
   $ echo a > a
   $ hg commit -d '0 0' -A -m a
@@ -26,7 +26,7 @@
   $ cat a
   a
 
-# file that was removed is recreated
+file that was removed is recreated
 
   $ cd ..
   $ hg init remove
@@ -45,7 +45,7 @@
   $ cat a
   content
 
-# backout of backout is as if nothing happened
+backout of backout is as if nothing happened
 
   $ hg backout -d '3 0' --merge tip
   removing a
@@ -53,7 +53,7 @@
   $ cat a 2>/dev/null || echo cat: a: No such file or directory
   cat: a: No such file or directory
 
-# across branch
+across branch
 
   $ cd ..
   $ hg init branch
@@ -83,7 +83,7 @@ should fail
   abort: cannot backout change on a different branch
   [255]
 
-# backout with merge
+backout with merge
 
   $ cd ..
   $ hg init merge
@@ -119,7 +119,7 @@ check line 1 is back
   line 2
   line 3
 
-# backout should not back out subsequent changesets
+backout should not back out subsequent changesets
 
   $ hg init onecs
   $ cd onecs
@@ -167,25 +167,25 @@ check line 1 is back
   (branch merge, don't forget to commit)
   $ hg commit -d '4 0' -A -m d
 
-# backout of merge should fail
+backout of merge should fail
 
   $ hg backout 4
   abort: cannot backout a merge changeset without --parent
   [255]
 
-# backout of merge with bad parent should fail
+backout of merge with bad parent should fail
 
   $ hg backout --parent 0 4
   abort: cb9a9f314b8b is not a parent of b2f3bb92043e
   [255]
 
-# backout of non-merge with parent should fail
+backout of non-merge with parent should fail
 
   $ hg backout --parent 0 3
   abort: cannot use --parent on non-merge changeset
   [255]
 
-# backout with valid parent should be ok
+backout with valid parent should be ok
 
   $ hg backout -d '5 0' --parent 2 4
   removing d
@@ -202,7 +202,7 @@ check line 1 is back
 
   $ cd ..
 
-# named branches
+named branches
 
   $ hg init named_branches
   $ cd named_branches
diff --git a/tests/test-empty-group.t b/tests/test-empty-group.t
--- a/tests/test-empty-group.t
+++ b/tests/test-empty-group.t
@@ -1,4 +1,3 @@
-#
 #  A          B
 #
 #  3  4       3
@@ -15,7 +14,6 @@
 #
 # (plus we test a failure where outgoing
 # wrongly reported the number of csets)
-#
 
   $ hg init a
   $ cd a
@@ -40,9 +38,6 @@
   (branch merge, don't forget to commit)
   $ hg ci -A -m m1
 
-#hg log
-#hg debugindex .hg/store/00manifest.i
-
   $ hg update -C 1
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge 2
@@ -51,9 +46,6 @@
   $ hg ci -A -m m2
   created new head
 
-#hg log
-#hg debugindex .hg/store/00manifest.i
-
   $ cd ..
 
   $ hg clone -r 3 a b
@@ -135,4 +127,3 @@
   adding file changes
   added 1 changesets with 0 changes to 0 files (+1 heads)
   (run 'hg heads' to see heads, 'hg merge' to merge)
-
diff --git a/tests/test-extdiff.t b/tests/test-extdiff.t
--- a/tests/test-extdiff.t
+++ b/tests/test-extdiff.t
@@ -135,8 +135,9 @@ Prepare custom diff/edit tool:
 
   $ chmod +x 'diff tool.py'
 
-# will change to /tmp/extdiff.TMP and populate directories a.TMP and a
-# and start tool
+will change to /tmp/extdiff.TMP and populate directories a.TMP and a
+and start tool
+
   $ hg extdiff -p "`pwd`/diff tool.py"
   [1]
 
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
@@ -1,4 +1,4 @@
-# test for issue351
+test for issue351
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
diff --git a/tests/test-hardlinks-safety.t b/tests/test-hardlinks-safety.t
--- a/tests/test-hardlinks-safety.t
+++ b/tests/test-hardlinks-safety.t
@@ -1,5 +1,5 @@
+some implementations of cp can't create hardlinks
 
-# some implementations of cp can't create hardlinks
   $ cat > cp.py <<EOF
   > from mercurial import util
   > import sys
diff --git a/tests/test-help.t b/tests/test-help.t
--- a/tests/test-help.t
+++ b/tests/test-help.t
@@ -1,4 +1,4 @@
-#!/bin/sh
+Short help:
 
   $ hg
   Mercurial Distributed SCM
diff --git a/tests/test-hook.t b/tests/test-hook.t
--- a/tests/test-hook.t
+++ b/tests/test-hook.t
@@ -1,6 +1,6 @@
   $ cp "$TESTDIR"/printenv.py .
 
-# commit hooks can see env vars
+commit hooks can see env vars
 
   $ hg init a
   $ cd a
@@ -27,14 +27,14 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ../b
 
-# changegroup hooks can see env vars
+changegroup hooks can see env vars
 
   $ echo '[hooks]' > .hg/hgrc
   $ echo 'prechangegroup = python ../printenv.py prechangegroup' >> .hg/hgrc
   $ echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc
   $ echo 'incoming = python ../printenv.py incoming' >> .hg/hgrc
 
-# pretxncommit and commit hooks can see both parents of merge
+pretxncommit and commit hooks can see both parents of merge
 
   $ cd ../a
   $ echo b >> a
@@ -65,7 +65,7 @@
   commit hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd 
   commit.b hook: HG_NODE=07f3376c1e655977439df2a814e3cc14b27abac2 HG_PARENT1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 HG_PARENT2=ab228980c14deea8b9555d91c9581127383e40fd 
 
-# test generic hooks
+test generic hooks
 
   $ hg id
   pre-identify hook: HG_ARGS=id HG_OPTS={'tags': None, 'rev': '', 'num': None, 'branch': None, 'id': None} HG_PATS=[] 
@@ -91,7 +91,7 @@
   added 3 changesets with 2 changes to 2 files
   (run 'hg update' to get a working copy)
 
-# tag hooks can see env vars
+tag hooks can see env vars
 
   $ cd ../a
   $ echo 'pretag = python ../printenv.py pretag' >> .hg/hgrc
@@ -108,7 +108,7 @@
   pretag hook: HG_LOCAL=1 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=la 
   tag hook: HG_LOCAL=1 HG_NODE=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 HG_TAG=la 
 
-# pretag hook can forbid tagging
+pretag hook can forbid tagging
 
   $ echo 'pretag.forbid = python ../printenv.py pretag.forbid 1' >> .hg/hgrc
   $ hg tag -d '4 0' fa
@@ -122,8 +122,8 @@
   abort: pretag.forbid hook exited with status 1
   [255]
 
-# pretxncommit hook can see changeset, can roll back txn, changeset
-# no more there after
+pretxncommit hook can see changeset, can roll back txn, changeset no
+more there after
 
   $ echo 'pretxncommit.forbid0 = hg tip -q' >> .hg/hgrc
   $ echo 'pretxncommit.forbid1 = python ../printenv.py pretxncommit.forbid 1' >> .hg/hgrc
@@ -144,7 +144,7 @@
   $ hg -q tip
   4:539e4b31b6dc
 
-# precommit hook can prevent commit
+precommit hook can prevent commit
 
   $ echo 'precommit.forbid = python ../printenv.py precommit.forbid 1' >> .hg/hgrc
   $ hg commit -m 'fail' -d '4 0'
@@ -155,14 +155,14 @@
   $ hg -q tip
   4:539e4b31b6dc
 
-# preupdate hook can prevent update
+preupdate hook can prevent update
 
   $ echo 'preupdate = python ../printenv.py preupdate' >> .hg/hgrc
   $ hg update 1
   preupdate hook: HG_PARENT1=ab228980c14d 
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
-# update hook
+update hook
 
   $ echo 'update = python ../printenv.py update' >> .hg/hgrc
   $ hg update
@@ -170,7 +170,7 @@
   update hook: HG_ERROR=0 HG_PARENT1=539e4b31b6dc 
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
-# prechangegroup hook can prevent incoming changes
+prechangegroup hook can prevent incoming changes
 
   $ cd ../b
   $ hg -q tip
@@ -184,8 +184,8 @@
   abort: prechangegroup.forbid hook exited with status 1
   [255]
 
-# pretxnchangegroup hook can see incoming changes, can roll back txn,
-# incoming changes no longer there after
+pretxnchangegroup hook can see incoming changes, can roll back txn,
+incoming changes no longer there after
 
   $ echo '[hooks]' > .hg/hgrc
   $ echo 'pretxnchangegroup.forbid0 = hg tip -q' >> .hg/hgrc
@@ -206,7 +206,7 @@
   $ hg -q tip
   3:07f3376c1e65
 
-# outgoing hooks can see env vars
+outgoing hooks can see env vars
 
   $ rm .hg/hgrc
   $ echo '[hooks]' > ../a/.hg/hgrc
@@ -225,7 +225,7 @@
   $ hg rollback
   rolling back to revision 3 (undo pull)
 
-# preoutgoing hook can prevent outgoing changes
+preoutgoing hook can prevent outgoing changes
 
   $ echo 'preoutgoing.forbid = python ../printenv.py preoutgoing.forbid 1' >> ../a/.hg/hgrc
   $ hg pull ../a
@@ -236,7 +236,7 @@
   abort: preoutgoing.forbid hook exited with status 1
   [255]
 
-# outgoing hooks work for local clones
+outgoing hooks work for local clones
 
   $ cd ..
   $ echo '[hooks]' > a/.hg/hgrc
@@ -249,7 +249,7 @@
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm -rf c
 
-# preoutgoing hook can prevent outgoing changes for local clones
+preoutgoing hook can prevent outgoing changes for local clones
 
   $ echo 'preoutgoing.forbid = python ../printenv.py preoutgoing.forbid 1' >> a/.hg/hgrc
   $ hg clone a zzz
@@ -296,7 +296,7 @@
   >     unreachable = 1
   > EOF
 
-# test python hooks
+test python hooks
 
   $ PYTHONPATH="`pwd`:$PYTHONPATH"
   $ export PYTHONPATH
@@ -385,7 +385,7 @@
   added 1 changesets with 1 changes to 1 files
   (run 'hg update' to get a working copy)
 
-# make sure --traceback works
+make sure --traceback works
 
   $ echo '[hooks]' > .hg/hgrc
   $ echo 'commit.abort = python:hooktests.aborthook' >> .hg/hgrc
@@ -422,7 +422,7 @@
   $ hg showconfig hooks
   hooks.commit.auto=<function autohook at .*>
 
-# test python hook configured with python:[file]:[hook] syntax
+test python hook configured with python:[file]:[hook] syntax
 
   $ cd ..
   $ mkdir d
@@ -446,7 +446,7 @@
 
   $ cd ../../b
 
-# make sure --traceback works on hook import failure
+make sure --traceback works on hook import failure
 
   $ cat > importfail.py <<EOF
   > import somebogusmodule
@@ -467,7 +467,7 @@
   ImportError: No module named hgext_importfail
   Traceback (most recent call last):
 
-# commit and update hooks should run after command completion (issue 1827)
+commit and update hooks should run after command completion (issue 1827)
 
   $ echo '[hooks]' > .hg/hgrc
   $ echo 'commit = hg id' >> .hg/hgrc
diff --git a/tests/test-init.t b/tests/test-init.t
--- a/tests/test-init.t
+++ b/tests/test-init.t
@@ -1,4 +1,4 @@
-# This test tries to exercise the ssh functionality with a dummy script
+This test tries to exercise the ssh functionality with a dummy script
 
   $ cat <<EOF > dummyssh
   > import sys
diff --git a/tests/test-issue1089.t b/tests/test-issue1089.t
--- a/tests/test-issue1089.t
+++ b/tests/test-issue1089.t
@@ -1,4 +1,4 @@
-# http://mercurial.selenic.com/bts/issue1089
+http://mercurial.selenic.com/bts/issue1089
 
   $ hg init
   $ mkdir a
diff --git a/tests/test-issue1175.t b/tests/test-issue1175.t
--- a/tests/test-issue1175.t
+++ b/tests/test-issue1175.t
@@ -1,4 +1,4 @@
-# http://mercurial.selenic.com/bts/issue1175
+http://mercurial.selenic.com/bts/issue1175
 
   $ hg init
   $ touch a
diff --git a/tests/test-issue1306.t b/tests/test-issue1306.t
--- a/tests/test-issue1306.t
+++ b/tests/test-issue1306.t
@@ -1,4 +1,4 @@
-# http://mercurial.selenic.com/bts/issue1306
+http://mercurial.selenic.com/bts/issue1306
 
 Initialize remote repo with branches:
 
diff --git a/tests/test-issue1438.t b/tests/test-issue1438.t
--- a/tests/test-issue1438.t
+++ b/tests/test-issue1438.t
@@ -1,4 +1,4 @@
-# http://mercurial.selenic.com/bts/issue1438
+http://mercurial.selenic.com/bts/issue1438
 
   $ "$TESTDIR/hghave" symlink || exit 80
 
diff --git a/tests/test-issue2137.t b/tests/test-issue2137.t
--- a/tests/test-issue2137.t
+++ b/tests/test-issue2137.t
@@ -1,12 +1,12 @@
-# http://mercurial.selenic.com/bts/issue2137
+http://mercurial.selenic.com/bts/issue2137
 
 Setup:
 
-# create a little extension that has 3 side-effects:
-#   1) ensure changelog data is not inlined
-#   2) make revlog to use lazyparser
-#   3) test that repo.lookup() works
-# 1 and 2 are preconditions for the bug; 3 is the bug.
+create a little extension that has 3 side-effects:
+1) ensure changelog data is not inlined
+2) make revlog to use lazyparser
+3) test that repo.lookup() works
+1 and 2 are preconditions for the bug; 3 is the bug.
 
   $ cat > commitwrapper.py <<EOF
   > from mercurial import extensions, node, revlog
@@ -39,7 +39,6 @@ Setup:
   adding a
   new tip: 553596fad57b
 
-
 Test that new changesets are visible to repo.lookup():
 
   $ echo a >> a
@@ -53,4 +52,3 @@ Test that new changesets are visible to 
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     one more commit to demonstrate the bug
   
-
diff --git a/tests/test-issue322.t b/tests/test-issue322.t
--- a/tests/test-issue322.t
+++ b/tests/test-issue322.t
@@ -1,4 +1,4 @@
-# http://mercurial.selenic.com/bts/issue322
+http://mercurial.selenic.com/bts/issue322
 
 File replaced with directory:
 
diff --git a/tests/test-issue433.t b/tests/test-issue433.t
--- a/tests/test-issue433.t
+++ b/tests/test-issue433.t
@@ -1,4 +1,4 @@
-# http://mercurial.selenic.com/bts/issue433
+http://mercurial.selenic.com/bts/issue433
 
   $ hg init
   $ echo a > a
diff --git a/tests/test-issue436.t b/tests/test-issue436.t
--- a/tests/test-issue436.t
+++ b/tests/test-issue436.t
@@ -1,4 +1,4 @@
-# http://mercurial.selenic.com/bts/issue436
+http://mercurial.selenic.com/bts/issue436
 
   $ hg init
   $ hg -v log -v
diff --git a/tests/test-issue522.t b/tests/test-issue522.t
--- a/tests/test-issue522.t
+++ b/tests/test-issue522.t
@@ -1,10 +1,10 @@
-# http://mercurial.selenic.com/bts/issue522
+http://mercurial.selenic.com/bts/issue522
 
-# In the merge below, the file "foo" has the same contents in both
-# parents, but if we look at the file-level history, we'll notice that
-# the version in p1 is an ancestor of the version in p2.  This test
-# makes sure that we'll use the version from p2 in the manifest of the
-# merge revision.
+In the merge below, the file "foo" has the same contents in both
+parents, but if we look at the file-level history, we'll notice that
+the version in p1 is an ancestor of the version in p2. This test makes
+sure that we'll use the version from p2 in the manifest of the merge
+revision.
 
   $ hg init
 
diff --git a/tests/test-issue612.t b/tests/test-issue612.t
--- a/tests/test-issue612.t
+++ b/tests/test-issue612.t
@@ -1,4 +1,4 @@
-# http://mercurial.selenic.com/bts/issue612
+http://mercurial.selenic.com/bts/issue612
 
   $ hg init
   $ mkdir src
diff --git a/tests/test-issue619.t b/tests/test-issue619.t
--- a/tests/test-issue619.t
+++ b/tests/test-issue619.t
@@ -1,4 +1,4 @@
-# http://mercurial.selenic.com/bts/issue619
+http://mercurial.selenic.com/bts/issue619
 
   $ hg init
   $ echo a > a
diff --git a/tests/test-issue660.t b/tests/test-issue660.t
--- a/tests/test-issue660.t
+++ b/tests/test-issue660.t
@@ -1,4 +1,4 @@
-# http://mercurial.selenic.com/bts/issue660
+http://mercurial.selenic.com/bts/issue660
 
   $ hg init
   $ echo a > a
diff --git a/tests/test-issue672.t b/tests/test-issue672.t
--- a/tests/test-issue672.t
+++ b/tests/test-issue672.t
@@ -1,4 +1,4 @@
-# http://mercurial.selenic.com/bts/issue672
+http://mercurial.selenic.com/bts/issue672
 
 # 0-2-4
 #  \ \ \
diff --git a/tests/test-issue842.t b/tests/test-issue842.t
--- a/tests/test-issue842.t
+++ b/tests/test-issue842.t
@@ -1,4 +1,4 @@
-# http://mercurial.selenic.com/bts/issue842
+http://mercurial.selenic.com/bts/issue842
 
   $ hg init
   $ echo foo > a
diff --git a/tests/test-log.t b/tests/test-log.t
--- a/tests/test-log.t
+++ b/tests/test-log.t
@@ -862,7 +862,6 @@ log -p -R repo
 #      \     /
 #         o
 #
-
 # Where "o" is a revision containing "foo" and
 # "x" is a revision without "foo"
 
diff --git a/tests/test-manifest.t b/tests/test-manifest.t
--- a/tests/test-manifest.t
+++ b/tests/test-manifest.t
@@ -1,5 +1,5 @@
-# Source bundle was generated with the following script.
-#
+Source bundle was generated with the following script:
+
 # hg init
 # echo a > a
 # ln -s a l
@@ -12,12 +12,10 @@
   $ hg init
   $ hg -q pull "$TESTDIR/test-manifest.hg"
 
-
 The next call is expected to return nothing:
 
   $ hg manifest
 
-
   $ hg co
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
diff --git a/tests/test-merge-commit.t b/tests/test-merge-commit.t
--- a/tests/test-merge-commit.t
+++ b/tests/test-merge-commit.t
@@ -1,4 +1,4 @@
-# Check that renames are correctly saved by a commit after a merge
+Check that renames are correctly saved by a commit after a merge
 
 Test with the merge on 3 having the rename on the local parent
 
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
@@ -1,5 +1,5 @@
-# Make sure that the internal merge tools (internal:fail, internal:local, and
-# internal:other) are used when matched by a merge-pattern in hgrc
+Make sure that the internal merge tools (internal:fail, internal:local, and
+internal:other) are used when matched by a merge-pattern in hgrc
 
 Make sure HGMERGE doesn't interfere with the test:
 
diff --git a/tests/test-merge-prompt.t b/tests/test-merge-prompt.t
--- a/tests/test-merge-prompt.t
+++ b/tests/test-merge-prompt.t
@@ -1,10 +1,9 @@
-# Test for
-#
-#   b5605d88dc27: Make ui.prompt repeat on "unrecognized response" again
-#                 (issue897)
-#
-#   840e2b315c1f: Fix misleading error and prompts during update/merge
-#                 (issue556)
+Test for
+b5605d88dc27: Make ui.prompt repeat on "unrecognized response" again
+ (issue897)
+
+840e2b315c1f: Fix misleading error and prompts during update/merge
+ (issue556)
 
   $ status() {
   >     [ $? -ne 0 ] && echo "failed."
diff --git a/tests/test-pull.t b/tests/test-pull.t
--- a/tests/test-pull.t
+++ b/tests/test-pull.t
@@ -73,8 +73,8 @@ Test 'file:' uri handling:
 
   $ hg pull -q file:../test
 
-# It's tricky to make file:// URLs working on every platforms
-# with regular shell commands.
+It's tricky to make file:// URLs working on every platform with
+regular shell commands.
 
   $ URL=`python -c "import os; print 'file://foobar' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test'"`
   $ hg pull -q "$URL"
diff --git a/tests/test-push-warn.t b/tests/test-push-warn.t
--- a/tests/test-push-warn.t
+++ b/tests/test-push-warn.t
@@ -466,8 +466,8 @@ Check prepush with new branch head on fo
   $ hg ci -Amb
   adding b
 
-# b is now branch head of B, and a topological head
-# a is now branch head of A, but not a topological head
+b is now branch head of B, and a topological head
+a is now branch head of A, but not a topological head
 
   $ hg clone . inner
   updating to branch B
@@ -479,7 +479,7 @@ Check prepush with new branch head on fo
   $ hg ci -Amb1
   adding b1
 
-# in the clone b1 is now the head of B
+in the clone b1 is now the head of B
 
   $ cd ..
   $ hg up 0
@@ -488,8 +488,9 @@ Check prepush with new branch head on fo
   $ hg ci -Ama2
   adding a2
 
-# a2 is now the new branch head of A, and a new topological head
-# it replaces a former inner branch head, so it should at most warn about A, not B
+a2 is now the new branch head of A, and a new topological head 
+it replaces a former inner branch head, so it should at most warn about
+A, not B
 
 glog of local:
 
@@ -542,7 +543,7 @@ Check prepush with new branch head on fo
   $ hg ci -Amb
   adding b
 
-# b is now branch head of B, and a topological head
+b is now branch head of B, and a topological head
 
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -550,7 +551,7 @@ Check prepush with new branch head on fo
   $ hg ci -Ama1
   adding a1
 
-# a1 is now branch head of A, and a topological head
+a1 is now branch head of A, and a topological head
 
   $ hg clone . inner
   updating to branch A
@@ -562,15 +563,15 @@ Check prepush with new branch head on fo
   $ hg ci -Amb1
   adding b1
 
-# in the clone b1 is now the head of B
+in the clone b1 is now the head of B
 
   $ cd ..
   $ echo a2 >a2
   $ hg ci -Ama2
   adding a2
 
-# a2 is now the new branch head of A, and a topological head
-# it replaces a former topological and branch head, so this should not warn
+a2 is now the new branch head of A, and a topological head
+it replaces a former topological and branch head, so this should not warn
 
 glog of local:
 
@@ -706,6 +707,3 @@ outgoing:
   searching for changes
   no changes found
   [1]
-
-  $ cd ..
-
diff --git a/tests/test-record.t b/tests/test-record.t
--- a/tests/test-record.t
+++ b/tests/test-record.t
@@ -1,57 +1,10 @@
-#!/bin/sh
+Set up a repo
 
   $ echo "[ui]" >> $HGRCPATH
   $ echo "interactive=true" >> $HGRCPATH
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "record=" >> $HGRCPATH
 
-Help
-
-  $ hg help record
-  hg record [OPTION]... [FILE]...
-  
-  interactively select changes to commit
-  
-      If a list of files is omitted, all changes reported by "hg status" will be
-      candidates for recording.
-  
-      See "hg help dates" for a list of formats valid for -d/--date.
-  
-      You will be prompted for whether to record changes to each modified file,
-      and for files with multiple changes, for each change to use. For each
-      query, the following responses are possible:
-  
-        y - record this change
-        n - skip this change
-  
-        s - skip remaining changes to this file
-        f - record remaining changes to this file
-  
-        d - done, skip remaining changes and files
-        a - record all changes to all remaining files
-        q - quit, recording no changes
-  
-        ? - display help
-  
-      This command is not available when committing a merge.
-  
-  options:
-  
-   -A --addremove            mark new/missing files as added/removed before
-                             committing
-      --close-branch         mark a branch as closed, hiding it from the branch
-                             list
-   -I --include PATTERN [+]  include names matching the given patterns
-   -X --exclude PATTERN [+]  exclude names matching the given patterns
-   -m --message TEXT         use text as commit message
-   -l --logfile FILE         read commit message from file
-   -d --date DATE            record datecode as commit date
-   -u --user USER            record the specified user as committer
-  
-  [+] marked option can be specified multiple times
-  
-  use "hg -v help record" to show global options
-
   $ hg init a
   $ cd a
 
diff --git a/tests/test-rename-after-merge.t b/tests/test-rename-after-merge.t
--- a/tests/test-rename-after-merge.t
+++ b/tests/test-rename-after-merge.t
@@ -1,5 +1,5 @@
-# Test issue 746: renaming files brought by the
-# second parent of a merge was broken.
+Test issue 746: renaming files brought by the second parent of a merge
+was broken.
 
 Create source repository:
 
@@ -59,9 +59,8 @@ Rename back c as b:
 
   $ cd ..
 
-# Test issue 1476: renaming a first parent file into
-# another first parent file while none of them belong to
-# the second parent was broken
+Test issue 1476: renaming a first parent file into another first
+parent file while none of them belong to the second parent was broken
 
   $ hg init repo1476
   $ cd repo1476
diff --git a/tests/test-revlog-group-emptyiter.t b/tests/test-revlog-group-emptyiter.t
--- a/tests/test-revlog-group-emptyiter.t
+++ b/tests/test-revlog-group-emptyiter.t
@@ -1,4 +1,5 @@
-# issue 1678
+issue 1678
+
 setting up base repo
   $ hg init a
   $ cd a
diff --git a/tests/test-status-color.t b/tests/test-status-color.t
--- a/tests/test-status-color.t
+++ b/tests/test-status-color.t
@@ -178,7 +178,7 @@ hg status -i ignoreddir/file:
   I ignoreddir/file
   $ cd ..
 
-# check 'status -q' and some combinations
+check 'status -q' and some combinations
 
   $ hg init repo3
   $ cd repo3
@@ -207,9 +207,10 @@ test unknown color
   ! deleted
   ? unknown
 
-# Run status with 2 different flags.
-# Check if result is the same or different.
-# If result is not as expected, raise error
+Run status with 2 different flags.
+Check if result is the same or different.
+If result is not as expected, raise error
+
   $ assert() {
   >     hg status --color=always $1 > ../a
   >     hg status --color=always $2 > ../b
@@ -229,7 +230,7 @@ test unknown color
   >     fi
   > }
 
-# assert flag1 flag2 [0-same | 1-different]
+assert flag1 flag2 [0-same | 1-different]
 
   $ assert "-q" "-mard"      0
   $ assert "-A" "-marduicC"  0
@@ -243,7 +244,8 @@ test unknown color
   $ assert "-r" "-d"         1
   $ cd ..
 
-# test 'resolve -l'
+test 'resolve -l'
+
   $ hg init repo4
   $ cd repo4
   $ echo "file a" > a
diff --git a/tests/test-status.t b/tests/test-status.t
--- a/tests/test-status.t
+++ b/tests/test-status.t
@@ -173,7 +173,7 @@ hg status -i ignoreddir/file:
   I ignoreddir/file
   $ cd ..
 
-# check 'status -q' and some combinations
+Check 'status -q' and some combinations
 
   $ hg init repo3
   $ cd repo3
@@ -191,9 +191,9 @@ hg status -i ignoreddir/file:
   $ rm deleted
   $ hg copy modified copied
 
-# Run status with 2 different flags.
-# Check if result is the same or different.
-# If result is not as expected, raise error
+Run status with 2 different flags.
+Check if result is the same or different.
+If result is not as expected, raise error
 
   $ assert() {
   >    hg status $1 > ../a
@@ -214,7 +214,7 @@ hg status -i ignoreddir/file:
   >     fi
   > }
 
-# assert flag1 flag2 [0-same | 1-different]
+Assert flag1 flag2 [0-same | 1-different]
 
   $ assert "-q" "-mard"      0
   $ assert "-A" "-marduicC"  0
diff --git a/tests/test-update-branches.t b/tests/test-update-branches.t
--- a/tests/test-update-branches.t
+++ b/tests/test-update-branches.t
@@ -69,8 +69,8 @@ Test helper functions:
   >     hg stat
   > }    
 
-# Test cases are documented in a table in the update function of merge.py.
-# Cases are run as shown in that table, row by row.
+Test cases are documented in a table in the update function of merge.py.
+Cases are run as shown in that table, row by row.
 
   $ norevtest 'none clean linear' clean 4
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-update-renames.t b/tests/test-update-renames.t
--- a/tests/test-update-renames.t
+++ b/tests/test-update-renames.t
@@ -1,6 +1,6 @@
-# test update logic when there are renames
+Test update logic when there are renames
 
-# update with local changes across a file rename
+Update with local changes across a file rename
 
   $ hg init
 
diff --git a/tests/test-url-rev.t b/tests/test-url-rev.t
--- a/tests/test-url-rev.t
+++ b/tests/test-url-rev.t
@@ -1,4 +1,4 @@
-# test basic functionality of url#rev syntax
+Test basic functionality of url#rev syntax
 
   $ hg init repo
   $ cd repo