diff --git a/tests/test-convert-darcs.out b/tests/test-convert-darcs.out
deleted file mode 100644
--- a/tests/test-convert-darcs.out
+++ /dev/null
@@ -1,45 +0,0 @@
-% try converting darcs1 repository
-darcs-1.0 repository format is unsupported, please upgrade
-% initialize darcs repo
-Finished recording patch 'p0'
-% branch and update
-Finished recording patch 'p1.1'
-% update source
-Finished recording patch 'p1.2'
-% merge branch
-Backing up ./a(-darcs-backup0)
-We have conflicts in the following files:
-./a
-Finished pulling and applying.
-Finished recording patch 'p2'
-% test file and directory move
-Finished recording patch 'p3'
-% test utf-8 commit message and author
-Finished recording patch 'p4: desc ñ'
-initializing destination darcs-repo-hg repository
-scanning source...
-sorting...
-converting...
-5 p0
-4 p1.2
-3 p1.1
-2 p2
-1 p3
-0 p4: desc ?
-o  5 "p4: desc ñ" (author ñ) files: g
-|
-o  4 "p3" (test@example.org) files: dir/d dir/d2 dir2/d f ff
-|
-o  3 "p2" (test@example.org) files: a dir/d dir/d2 f
-|
-o  2 "p1.1" (test@example.org) files:
-|
-o  1 "p1.2" (test@example.org) files: a b
-|
-o  0 "p0" (test@example.org) files: a
-
-7225b30cdf38257d5cc7780772c051b6f33e6d6b 644   a
-1e88685f5ddec574a34c70af492f95b6debc8741 644   b
-37406831adc447ec2385014019599dfec953c806 644   dir2/d
-b783a337463792a5c7d548ad85a7d3253c16ba8c 644   ff
-0973eb1b2ecc4de7fafe7447ce1b7462108b4848 644   g
diff --git a/tests/test-convert-darcs b/tests/test-convert-darcs.t
old mode 100755
new mode 100644
rename from tests/test-convert-darcs
rename to tests/test-convert-darcs.t
--- a/tests/test-convert-darcs
+++ b/tests/test-convert-darcs.t
@@ -1,84 +1,131 @@
-#!/bin/sh
-
-"$TESTDIR/hghave" darcs || exit 80
 
-echo "[extensions]" >> $HGRCPATH
-echo "convert=" >> $HGRCPATH
-echo 'graphlog =' >> $HGRCPATH
+  $ "$TESTDIR/hghave" darcs || exit 80
+  $ echo "[extensions]" >> $HGRCPATH
+  $ echo "convert=" >> $HGRCPATH
+  $ echo 'graphlog =' >> $HGRCPATH
+  $ DARCS_EMAIL='test@example.org'; export DARCS_EMAIL
+  $ HOME=`pwd`/do_not_use_HOME_darcs; export HOME
+
+skip if we can't import elementtree
 
-DARCS_EMAIL='test@example.org'; export DARCS_EMAIL
-HOME=`pwd`/do_not_use_HOME_darcs; export HOME
+  $ mkdir dummy
+  $ mkdir dummy/_darcs
+  $ if hg convert dummy 2>&1 | grep ElementTree > /dev/null; then
+  >     echo 'skipped: missing feature: elementtree module'
+  >     exit 80
+  > fi
 
-# skip if we can't import elementtree
-mkdir dummy
-mkdir dummy/_darcs
-if hg convert dummy 2>&1 | grep ElementTree > /dev/null; then
-    echo 'skipped: missing feature: elementtree module'
-    exit 80
-fi
+try converting darcs1 repository
+
+  $ hg clone -q "$TESTDIR/darcs1.hg" darcs
+  $ hg convert -s darcs darcs/darcs1 2>&1 | grep darcs-1.0
+  darcs-1.0 repository format is unsupported, please upgrade
+
+initialize darcs repo
 
-echo '% try converting darcs1 repository'
-hg clone -q "$TESTDIR/darcs1.hg" darcs
-hg convert -s darcs darcs/darcs1 2>&1 | grep darcs-1.0
+  $ mkdir darcs-repo
+  $ cd darcs-repo
+  $ darcs init
+  $ echo a > a
+  $ darcs record -a -l -m p0
+  Finished recording patch 'p0'
+  $ cd ..
+
+branch and update
 
-echo % initialize darcs repo
-mkdir darcs-repo
-cd darcs-repo
-darcs init
-echo a > a
-darcs record -a -l -m p0
-cd ..
+  $ darcs get darcs-repo darcs-clone >/dev/null
+  $ cd darcs-clone
+  $ echo c >> a
+  $ echo c > c
+  $ darcs record -a -l -m p1.1
+  Finished recording patch 'p1.1'
+  $ cd ..
 
-echo % branch and update
-darcs get darcs-repo darcs-clone >/dev/null
-cd darcs-clone
-echo c >> a
-echo c > c
-darcs record -a -l -m p1.1
-cd ..
+update source
+
+  $ cd darcs-repo
+  $ echo b >> a
+  $ echo b > b
+  $ darcs record -a -l -m p1.2
+  Finished recording patch 'p1.2'
+
+merge branch
 
-echo % update source
-cd darcs-repo
-echo b >> a
-echo b > b
-darcs record -a -l -m p1.2
+  $ darcs pull -a ../darcs-clone
+  Backing up ./a(-darcs-backup0)
+  We have conflicts in the following files:
+  ./a
+  Finished pulling and applying.
+  $ sleep 1
+  $ echo e > a
+  $ echo f > f
+  $ mkdir dir
+  $ echo d > dir/d
+  $ echo d > dir/d2
+  $ darcs record -a -l -m p2
+  Finished recording patch 'p2'
+
+test file and directory move
 
-echo % merge branch
-darcs pull -a ../darcs-clone
-sleep 1
-echo e > a
-echo f > f
-mkdir dir
-echo d > dir/d
-echo d > dir/d2
-darcs record -a -l -m p2
+  $ darcs mv f ff
+
+Test remove + move
+
+  $ darcs remove dir/d2
+  $ rm dir/d2
+  $ darcs mv dir dir2
+  $ darcs record -a -l -m p3
+  Finished recording patch 'p3'
+
+test utf-8 commit message and author
+
+  $ echo g > g
+
+darcs is encoding agnostic, so it takes whatever bytes it's given
 
-echo % test file and directory move
-darcs mv f ff
-# Test remove + move
-darcs remove dir/d2
-rm dir/d2
-darcs mv dir dir2
-darcs record -a -l -m p3
-
-echo % test utf-8 commit message and author
-echo g > g
-# darcs is encoding agnostic, so it takes whatever bytes it's given
-darcs record -a -l -m 'p4: desc ñ' -A 'author ñ'
+  $ darcs record -a -l -m 'p4: desc ñ' -A 'author ñ'
+  Finished recording patch 'p4: desc ñ'
+  $ glog()
+  > {
+  >     HGENCODING=utf-8 hg glog --template '{rev} "{desc|firstline}" ({author}) files: {files}\n' "$@"
+  > }
+  $ cd ..
+  $ hg convert darcs-repo darcs-repo-hg
+  initializing destination darcs-repo-hg repository
+  scanning source...
+  sorting...
+  converting...
+  5 p0
+  4 p1.2
+  3 p1.1
+  2 p2
+  1 p3
+  0 p4: desc ?
 
-glog()
-{
-    HGENCODING=utf-8 hg glog --template '{rev} "{desc|firstline}" ({author}) files: {files}\n' "$@"
-}
+The converter does not currently handle patch conflicts very well.
+When they occur, it reverts *all* changes and moves forward,
+letting the conflict resolving patch fix collisions.
+Unfortunately, non-conflicting changes, like the addition of the
+"c" file in p1.1 patch are reverted too.
+Just to say that manifest not listing "c" here is a bug.
 
-cd ..
-hg convert darcs-repo darcs-repo-hg
-# The converter does not currently handle patch conflicts very well.
-# When they occur, it reverts *all* changes and moves forward,
-# letting the conflict resolving patch fix collisions.
-# Unfortunately, non-conflicting changes, like the addition of the
-# "c" file in p1.1 patch are reverted too.
-# Just to say that manifest not listing "c" here is a bug.
-glog -R darcs-repo-hg
-hg up -q -R darcs-repo-hg
-hg -R darcs-repo-hg manifest --debug
+  $ glog -R darcs-repo-hg
+  o  5 "p4: desc ñ" (author ñ) files: g
+  |
+  o  4 "p3" (test@example.org) files: dir/d dir/d2 dir2/d f ff
+  |
+  o  3 "p2" (test@example.org) files: a dir/d dir/d2 f
+  |
+  o  2 "p1.1" (test@example.org) files:
+  |
+  o  1 "p1.2" (test@example.org) files: a b
+  |
+  o  0 "p0" (test@example.org) files: a
+  
+  $ hg up -q -R darcs-repo-hg
+  $ hg -R darcs-repo-hg manifest --debug
+  7225b30cdf38257d5cc7780772c051b6f33e6d6b 644   a
+  1e88685f5ddec574a34c70af492f95b6debc8741 644   b
+  37406831adc447ec2385014019599dfec953c806 644   dir2/d
+  b783a337463792a5c7d548ad85a7d3253c16ba8c 644   ff
+  0973eb1b2ecc4de7fafe7447ce1b7462108b4848 644   g