diff --git a/tests/test-diffstat.out b/tests/test-diffstat.out
deleted file mode 100644
--- a/tests/test-diffstat.out
+++ /dev/null
@@ -1,15 +0,0 @@
-% wide diffstat
- a |  213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 213 insertions(+), 0 deletions(-)
-% diffstat width
- a |  213 ++++++++++++++
- 1 files changed, 213 insertions(+), 0 deletions(-)
-% narrow diffstat
- a |  3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-% binary diffstat
- b |    0 
- 1 files changed, 0 insertions(+), 0 deletions(-)
-% binary git diffstat
- b |  Bin 
- 1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/tests/test-diffstat b/tests/test-diffstat.t
old mode 100755
new mode 100644
rename from tests/test-diffstat
rename to tests/test-diffstat.t
--- a/tests/test-diffstat
+++ b/tests/test-diffstat.t
@@ -1,34 +1,48 @@
-#!/bin/sh
+  $ hg init repo
+  $ cd repo
+  $ i=0; while [ "$i" -lt 213 ]; do echo a >> a; i=`expr $i + 1`; done
+  $ hg add a
 
-hg init repo
-cd repo
-i=0; while [ "$i" -lt 213 ]; do echo a >> a; i=`expr $i + 1`; done
-hg add a
+Wide diffstat:
 
-echo '% wide diffstat'
-hg diff --stat
+  $ hg diff --stat
+   a |  213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+   1 files changed, 213 insertions(+), 0 deletions(-)
+
+diffstat width:
 
-echo '% diffstat width'
-COLUMNS=24 hg diff --config ui.interactive=true --stat
+  $ COLUMNS=24 hg diff --config ui.interactive=true --stat
+   a |  213 ++++++++++++++
+   1 files changed, 213 insertions(+), 0 deletions(-)
 
-hg ci -m adda
+  $ hg ci -m adda
 
-cat >> a <<EOF
-a
-a
-a
-EOF
+  $ cat >> a <<EOF
+  > a
+  > a
+  > a
+  > EOF
 
-echo '% narrow diffstat'
-hg diff --stat
+Narrow diffstat:
+
+  $ hg diff --stat
+   a |  3 +++
+   1 files changed, 3 insertions(+), 0 deletions(-)
+
+  $ hg ci -m appenda
 
-hg ci -m appenda
+  $ printf '\0' > b
+  $ hg add b
 
-printf '\0' > b
-hg add b
+Binary diffstat:
 
-echo '% binary diffstat'
-hg diff --stat
+  $ hg diff --stat
+   b |    0 
+   1 files changed, 0 insertions(+), 0 deletions(-)
 
-echo '% binary git diffstat'
-hg diff --stat --git
+Binary git diffstat:
+
+  $ hg diff --stat --git
+   b |  Bin 
+   1 files changed, 0 insertions(+), 0 deletions(-)
+