diff --git a/tests/test-template-engine.out b/tests/test-template-engine.out
deleted file mode 100644
--- a/tests/test-template-engine.out
+++ /dev/null
@@ -1,3 +0,0 @@
-adding changeset.txt
-adding mymap
-0 97e5f848f0936960273bbf75be6388cd0350a32b test
diff --git a/tests/test-template-engine b/tests/test-template-engine.t
old mode 100755
new mode 100644
rename from tests/test-template-engine
rename to tests/test-template-engine.t
--- a/tests/test-template-engine
+++ b/tests/test-template-engine.t
@@ -1,39 +1,37 @@
-#!/bin/sh
 
-cat > engine.py << EOF
-
-from mercurial import templater
-
-class mytemplater(object):
-    def __init__(self, loader, filters, defaults):
-        self.loader = loader
-
-    def process(self, t, map):
-        tmpl = self.loader(t)
-        for k, v in map.iteritems():
-            if k in ('templ', 'ctx', 'repo', 'revcache', 'cache'):
-                continue
-            if hasattr(v, '__call__'):
-                v = v(**map)
-            v = templater.stringify(v)
-            tmpl = tmpl.replace('{{%s}}' % k, v)
-        yield tmpl
-
-templater.engines['my'] = mytemplater
-EOF
-
-hg init test
-echo '[extensions]' > test/.hg/hgrc
-echo "engine = `pwd`/engine.py" >> test/.hg/hgrc
-
-cd test
-cat > mymap << EOF
-changeset = my:changeset.txt
-EOF
-
-cat > changeset.txt << EOF
-{{rev}} {{node}} {{author}}
-EOF
-
-hg ci -Ama
-hg log --style=./mymap
+  $ cat > engine.py << EOF
+  > 
+  > from mercurial import templater
+  > 
+  > class mytemplater(object):
+  >     def __init__(self, loader, filters, defaults):
+  >         self.loader = loader
+  > 
+  >     def process(self, t, map):
+  >         tmpl = self.loader(t)
+  >         for k, v in map.iteritems():
+  >             if k in ('templ', 'ctx', 'repo', 'revcache', 'cache'):
+  >                 continue
+  >             if hasattr(v, '__call__'):
+  >                 v = v(**map)
+  >             v = templater.stringify(v)
+  >             tmpl = tmpl.replace('{{%s}}' % k, v)
+  >         yield tmpl
+  > 
+  > templater.engines['my'] = mytemplater
+  > EOF
+  $ hg init test
+  $ echo '[extensions]' > test/.hg/hgrc
+  $ echo "engine = `pwd`/engine.py" >> test/.hg/hgrc
+  $ cd test
+  $ cat > mymap << EOF
+  > changeset = my:changeset.txt
+  > EOF
+  $ cat > changeset.txt << EOF
+  > {{rev}} {{node}} {{author}}
+  > EOF
+  $ hg ci -Ama
+  adding changeset.txt
+  adding mymap
+  $ hg log --style=./mymap
+  0 97e5f848f0936960273bbf75be6388cd0350a32b test