diff --git a/tests/test-diff-color.out b/tests/test-diff-color.out
deleted file mode 100644
--- a/tests/test-diff-color.out
+++ /dev/null
@@ -1,63 +0,0 @@
-adding a
-% default context
-diff -r cf9f4ba66af2 a
---- a/a
-+++ b/a
-@@ -2,7 +2,7 @@
- c
- a
- a
--b
-+dd
- a
- a
- c
-% --unified=2
-diff -r cf9f4ba66af2 a
---- a/a
-+++ b/a
-@@ -3,5 +3,5 @@
- a
- a
--b
-+dd
- a
- a
-% diffstat
- a |  2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-% record
-diff --git a/a b/a
-old mode 100644
-new mode 100755
-1 hunks, 1 lines changed
-examine changes to 'a'? [Ynsfdaq?] 
-@@ -2,7 +2,7 @@
- c
- a
- a
--b
-+dd
- a
- a
- c
-record this change to 'a'? [Ynsfdaq?] 
-
-rolling back to revision 0 (undo commit)
-% qrecord
-diff --git a/a b/a
-old mode 100644
-new mode 100755
-1 hunks, 1 lines changed
-examine changes to 'a'? [Ynsfdaq?] 
-@@ -2,7 +2,7 @@
- c
- a
- a
--b
-+dd
- a
- a
- c
-record this change to 'a'? [Ynsfdaq?] 
-
diff --git a/tests/test-diff-color b/tests/test-diff-color.t
old mode 100755
new mode 100644
rename from tests/test-diff-color
rename to tests/test-diff-color.t
--- a/tests/test-diff-color
+++ b/tests/test-diff-color.t
@@ -1,64 +1,124 @@
-#!/bin/sh
-
-echo "[extensions]" >> $HGRCPATH
-echo "color=" >> $HGRCPATH
+Setup
 
-hg init repo
-cd repo
-cat > a <<EOF
-c
-c
-a
-a
-b
-a
-a
-c
-c
-EOF
-hg ci -Am adda
-cat > a <<EOF
-c
-c
-a
-a
-dd
-a
-a
-c
-c
-EOF
+  $ echo "[extensions]" >> $HGRCPATH
+  $ echo "color=" >> $HGRCPATH
+  $ hg init repo
+  $ cd repo
+  $ cat > a <<EOF
+  > c
+  > c
+  > a
+  > a
+  > b
+  > a
+  > a
+  > c
+  > c
+  > EOF
+  $ hg ci -Am adda
+  adding a
+  $ cat > a <<EOF
+  > c
+  > c
+  > a
+  > a
+  > dd
+  > a
+  > a
+  > c
+  > c
+  > EOF
+
+default context
+
+  $ hg diff --nodates --color=always
+  diff -r cf9f4ba66af2 a
+  --- a/a
+  +++ b/a
+  @@ -2,7 +2,7 @@
+   c
+   a
+   a
+  -b
+  +dd
+   a
+   a
+   c
+
+--unified=2
+
+  $ hg diff --nodates -U 2  --color=always
+  diff -r cf9f4ba66af2 a
+  --- a/a
+  +++ b/a
+  @@ -3,5 +3,5 @@
+   a
+   a
+  -b
+  +dd
+   a
+   a
 
-echo '% default context'
-hg diff --nodates --color=always
-
-echo '% --unified=2'
-hg diff --nodates -U 2  --color=always
+diffstat
 
-echo '% diffstat'
-hg diff --stat --color=always
+  $ hg diff --stat --color=always
+   a |  2 +-
+   1 files changed, 1 insertions(+), 1 deletions(-)
+  $ echo "record=" >> $HGRCPATH
+  $ echo "[ui]" >> $HGRCPATH
+  $ echo "interactive=true" >> $HGRCPATH
+  $ echo "[diff]" >> $HGRCPATH
+  $ echo "git=True" >> $HGRCPATH
 
-echo "record=" >> $HGRCPATH
-echo "[ui]" >> $HGRCPATH
-echo "interactive=true" >> $HGRCPATH
-echo "[diff]" >> $HGRCPATH
-echo "git=True" >> $HGRCPATH
+record
 
-echo % record
-chmod 0755 a
-hg record --color=always -m moda a <<EOF
-y
-y
-EOF
-echo
+  $ chmod 0755 a
+  $ hg record --color=always -m moda a <<EOF
+  > y
+  > y
+  > EOF
+  diff --git a/a b/a
+  old mode 100644
+  new mode 100755
+  1 hunks, 1 lines changed
+  examine changes to 'a'? [Ynsfdaq?] 
+  @@ -2,7 +2,7 @@
+   c
+   a
+   a
+  -b
+  +dd
+   a
+   a
+   c
+  record this change to 'a'? [Ynsfdaq?] 
+  $ echo
+  
+  $ echo "[extensions]" >> $HGRCPATH
+  $ echo "mq=" >> $HGRCPATH
+  $ hg rollback
+  rolling back to revision 0 (undo commit)
 
-echo "[extensions]" >> $HGRCPATH
-echo "mq=" >> $HGRCPATH
+qrecord
 
-hg rollback
-echo % qrecord
-hg qrecord --color=always -m moda patch <<EOF
-y
-y
-EOF
-echo
+  $ hg qrecord --color=always -m moda patch <<EOF
+  > y
+  > y
+  > EOF
+  diff --git a/a b/a
+  old mode 100644
+  new mode 100755
+  1 hunks, 1 lines changed
+  examine changes to 'a'? [Ynsfdaq?] 
+  @@ -2,7 +2,7 @@
+   c
+   a
+   a
+  -b
+  +dd
+   a
+   a
+   c
+  record this change to 'a'? [Ynsfdaq?] 
+  $ echo
+