diff --git a/tests/test-eol-clone.out b/tests/test-eol-clone.out
deleted file mode 100644
--- a/tests/test-eol-clone.out
+++ /dev/null
@@ -1,36 +0,0 @@
-% setup repository
-adding .hgeol
-adding a.txt
-% hg clone repo repo-2
-updating to branch default
-2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-% printrepr.py a.txt
-first\r
-second\r
-third\r
-% hg cat a.txt
-first
-second
-third
-% hg clone repo repo-3
-updating to branch default
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-% printrepr.py a.txt
-first
-second
-third
-% hg clone -r 1 repo repo-4
-requesting all changes
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 2 changes to 2 files
-updating to branch default
-2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-% cat .hgeol
-[patterns]
-**.txt = native
-% printrepr.py a.txt
-first\r
-second\r
-third\r
diff --git a/tests/test-eol-clone b/tests/test-eol-clone.t
old mode 100755
new mode 100644
rename from tests/test-eol-clone
rename to tests/test-eol-clone.t
--- a/tests/test-eol-clone
+++ b/tests/test-eol-clone.t
@@ -1,63 +1,78 @@
-#!/bin/sh
-
-cat > $HGRCPATH <<EOF
-[diff]
-git = True
+Testing cloning with the EOL extension
 
-[extensions]
-eol =
-
-[eol]
-native = CRLF
-EOF
+  $ cat > $HGRCPATH <<EOF
+  > [diff]
+  > git = True
+  > 
+  > [extensions]
+  > eol =
+  > 
+  > [eol]
+  > native = CRLF
+  > EOF
 
-echo "% setup repository"
-hg init repo
-cd repo
+setup repository
 
-cat > .hgeol <<EOF
-[patterns]
-**.txt = native
-EOF
+  $ hg init repo
+  $ cd repo
+  $ cat > .hgeol <<EOF
+  > [patterns]
+  > **.txt = native
+  > EOF
+  $ printf "first\r\nsecond\r\nthird\r\n" > a.txt
+  $ hg commit --addremove -m 'checkin'
+  adding .hgeol
+  adding a.txt
 
-printf "first\r\nsecond\r\nthird\r\n" > a.txt
-hg commit --addremove -m 'checkin'
-cd ..
-
-echo "% hg clone repo repo-2"
-hg clone repo repo-2
-cd repo-2
+Clone
 
-echo '% printrepr.py a.txt'
-python $TESTDIR/printrepr.py < a.txt
-echo '% hg cat a.txt'
-hg cat a.txt | python $TESTDIR/printrepr.py
+  $ cd ..
+  $ hg clone repo repo-2
+  updating to branch default
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cd repo-2
+  $ python $TESTDIR/printrepr.py < a.txt
+  first\r
+  second\r
+  third\r
+  $ hg cat a.txt | python $TESTDIR/printrepr.py
+  first
+  second
+  third
+  $ hg remove .hgeol
+  $ hg commit -m 'remove eol'
+  $ hg push --quiet
+  $ cd ..
 
-hg remove .hgeol
-hg commit -m 'remove eol'
-hg push --quiet
+Test clone of repo with .hgeol in working dir, but no .hgeol in tip
 
-cd ..
-
-# Test clone of repo with .hgeol in working dir, but no .hgeol in tip
-echo "% hg clone repo repo-3"
-hg clone repo repo-3
-cd repo-3
+  $ hg clone repo repo-3
+  updating to branch default
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cd repo-3
 
-echo '% printrepr.py a.txt'
-python $TESTDIR/printrepr.py < a.txt
+  $ python $TESTDIR/printrepr.py < a.txt
+  first
+  second
+  third
 
-cd ..
+Test clone of revision with .hgeol
 
-# Test clone of revision with .hgeol
-echo "% hg clone -r 1 repo repo-4"
-hg clone -r 0 repo repo-4
-cd repo-4
+  $ cd ..
+  $ hg clone -r 0 repo repo-4
+  requesting all changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 1 changesets with 2 changes to 2 files
+  updating to branch default
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cd repo-4
+  $ cat .hgeol
+  [patterns]
+  **.txt = native
 
-echo '% cat .hgeol'
-cat .hgeol
-
-echo '% printrepr.py a.txt'
-python $TESTDIR/printrepr.py < a.txt
-
-cd ..
+  $ python $TESTDIR/printrepr.py < a.txt
+  first\r
+  second\r
+  third\r