diff --git a/tests/test-eolfilename.out b/tests/test-eolfilename.out
deleted file mode 100644
--- a/tests/test-eolfilename.out
+++ /dev/null
@@ -1,20 +0,0 @@
-% test issue352
-adding he
llo
-abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
-adding he
llo
-abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
-adding hell
-o
-abort: '\n' and '\r' disallowed in filenames: 'hell\no'
-adding hell
-o
-abort: '\n' and '\r' disallowed in filenames: 'hell\no'
-f  he
llo  he
llo
-f  hell
-o  hell
-o
-% test issue2039
-? foo
-bar
-? foo
-bar.baz
diff --git a/tests/test-eolfilename b/tests/test-eolfilename.t
old mode 100755
new mode 100644
rename from tests/test-eolfilename
rename to tests/test-eolfilename.t
--- a/tests/test-eolfilename
+++ b/tests/test-eolfilename.t
@@ -1,43 +1,57 @@
-#!/bin/sh
-# http://mercurial.selenic.com/bts/issue352
-
-"$TESTDIR/hghave" eol-in-paths || exit 80
-
-echo % test issue352
-hg init foo
-cd foo
+http://mercurial.selenic.com/bts/issue352
 
-A=`printf 'he\rllo'`
+  $ "$TESTDIR/hghave" eol-in-paths || exit 80
 
-echo foo > "$A"
-hg add
-hg ci -A -m m
-rm "$A"
-
-echo foo > "hell
-o"
-hg add
-hg ci -A -m m
+test issue352
 
-echo foo > "$A"
-hg debugwalk
-
-# http://mercurial.selenic.com/bts/issue2036
-cd ..
-echo % test issue2039
-
-hg init bar
-cd bar
+  $ hg init foo
+  $ cd foo
+  $ A=`printf 'he\rllo'`
+  $ echo foo > "$A"
+  $ hg add
+  adding he
llo
+  abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
+  [255]
+  $ hg ci -A -m m
+  adding he
llo
+  abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
+  [255]
+  $ rm "$A"
+  $ echo foo > "hell
+  > o"
+  $ hg add
+  adding hell
+  o
+  abort: '\n' and '\r' disallowed in filenames: 'hell\no'
+  [255]
+  $ hg ci -A -m m
+  adding hell
+  o
+  abort: '\n' and '\r' disallowed in filenames: 'hell\no'
+  [255]
+  $ echo foo > "$A"
+  $ hg debugwalk
+  f  he
llo  he
llo
+  f  hell
+  o  hell
+  o
 
-echo "[extensions]" >> $HGRCPATH
-echo "color=" >> $HGRCPATH
+http://mercurial.selenic.com/bts/issue2036
 
-A=`printf 'foo\nbar'`
-B=`printf 'foo\nbar.baz'`
+  $ cd ..
+
+test issue2039
 
-touch "$A"
-touch "$B"
-
-hg status --color=always
-
-exit 0
+  $ hg init bar
+  $ cd bar
+  $ echo "[extensions]" >> $HGRCPATH
+  $ echo "color=" >> $HGRCPATH
+  $ A=`printf 'foo\nbar'`
+  $ B=`printf 'foo\nbar.baz'`
+  $ touch "$A"
+  $ touch "$B"
+  $ hg status --color=always
+  ? foo
+  bar
+  ? foo
+  bar.baz