diff --git a/tests/test-dispatch.out b/tests/test-dispatch.out
deleted file mode 100644
--- a/tests/test-dispatch.out
+++ /dev/null
@@ -1,37 +0,0 @@
-adding a
-# missing arg
-hg cat: invalid arguments
-hg cat [OPTION]... FILE...
-
-output the current or given revision of files
-
-    Print the specified files as they were at the given revision. If no
-    revision is given, the parent of the working directory is used, or tip if
-    no revision is checked out.
-
-    Output may be to a file, in which case the name of the file is given using
-    a format string. The formatting rules are the same as for the export
-    command, with the following additions:
-
-    "%s"  basename of file being printed
-    "%d"  dirname of file being printed, or '.' if in repository root
-    "%p"  root-relative path name of file being printed
-
-    Returns 0 on success.
-
-options:
-
- -o --output FORMAT        print output to file with formatted name
- -r --rev REV              print the given revision
-    --decode               apply any matching decode filter
- -I --include PATTERN [+]  include names matching the given patterns
- -X --exclude PATTERN [+]  exclude names matching the given patterns
-
-[+] marked option can be specified multiple times
-
-use "hg -v help cat" to show global options
-% [defaults]
-a
-a: no such file in rev 000000000000
-% no repo
-abort: There is no Mercurial repository here (.hg not found)!
diff --git a/tests/test-dispatch b/tests/test-dispatch.t
old mode 100755
new mode 100644
rename from tests/test-dispatch
rename to tests/test-dispatch.t
--- a/tests/test-dispatch
+++ b/tests/test-dispatch.t
@@ -1,29 +1,65 @@
-#!/bin/sh
-# test command parsing and dispatch
+test command parsing and dispatch
 
-"$TESTDIR/hghave" no-outer-repo || exit 80
+  $ "$TESTDIR/hghave" no-outer-repo || exit 80
 
-dir=`pwd`
+  $ dir=`pwd`
 
-hg init a
-cd a
-echo a > a
-hg ci -Ama
+  $ hg init a
+  $ cd a
+  $ echo a > a
+  $ hg ci -Ama
+  adding a
 
-echo "# missing arg"
-hg cat
+Missing arg:
 
-echo '% [defaults]'
-hg cat a
-cat >> $HGRCPATH <<EOF
+  $ hg cat
+  hg cat: invalid arguments
+  hg cat [OPTION]... FILE...
+  
+  output the current or given revision of files
+  
+      Print the specified files as they were at the given revision. If no
+      revision is given, the parent of the working directory is used, or tip if
+      no revision is checked out.
+  
+      Output may be to a file, in which case the name of the file is given using
+      a format string. The formatting rules are the same as for the export
+      command, with the following additions:
+  
+      "%s"  basename of file being printed
+      "%d"  dirname of file being printed, or '.' if in repository root
+      "%p"  root-relative path name of file being printed
+  
+      Returns 0 on success.
+  
+  options:
+  
+   -o --output FORMAT        print output to file with formatted name
+   -r --rev REV              print the given revision
+      --decode               apply any matching decode filter
+   -I --include PATTERN [+]  include names matching the given patterns
+   -X --exclude PATTERN [+]  exclude names matching the given patterns
+  
+  [+] marked option can be specified multiple times
+  
+  use "hg -v help cat" to show global options
+
 [defaults]
-cat = -r null
-EOF
-hg cat a
 
-echo '% no repo'
-cd $dir
-hg cat
+  $ hg cat a
+  a
+  $ cat >> $HGRCPATH <<EOF
+  > [defaults]
+  > cat = -r null
+  > EOF
+  $ hg cat a
+  a: no such file in rev 000000000000
 
-exit 0
+No repo:
 
+  $ cd $dir
+  $ hg cat
+  abort: There is no Mercurial repository here (.hg not found)!
+
+  $ exit 0
+