diff --git a/tests/test-subrepo-paths.out b/tests/test-subrepo-paths.out
deleted file mode 100644
--- a/tests/test-subrepo-paths.out
+++ /dev/null
@@ -1,10 +0,0 @@
-% hg debugsub with no remapping
-path sub
- source   http://example.net/libfoo
- revision 
-% hg debugsub with remapping
-path sub
- source   ssh://localhost/libfoo
- revision 
-% test bad subpaths pattern
-abort: bad subrepository pattern in $HGTMP/test-subrepo-paths/outer/.hg/hgrc:2: invalid group reference
diff --git a/tests/test-subrepo-paths b/tests/test-subrepo-paths.t
old mode 100755
new mode 100644
rename from tests/test-subrepo-paths
rename to tests/test-subrepo-paths.t
--- a/tests/test-subrepo-paths
+++ b/tests/test-subrepo-paths.t
@@ -1,27 +1,35 @@
-#!/bin/sh
+  $ hg init outer
+  $ cd outer
 
-hg init outer
-cd outer
+  $ echo 'sub = http://example.net/libfoo' > .hgsub
+  $ hg add .hgsub
+
+hg debugsub with no remapping
 
-echo 'sub = http://example.net/libfoo' > .hgsub
-hg add .hgsub
+  $ hg debugsub
+  path sub
+   source   http://example.net/libfoo
+   revision 
 
-echo '% hg debugsub with no remapping'
-hg debugsub
+  $ cat > .hg/hgrc <<EOF
+  > [subpaths]
+  > http://example.net = ssh://localhost
+  > EOF
 
-cat > .hg/hgrc <<EOF
-[subpaths]
-http://example.net = ssh://localhost
-EOF
+hg debugsub with remapping
 
-echo '% hg debugsub with remapping'
-hg debugsub
+  $ hg debugsub
+  path sub
+   source   ssh://localhost/libfoo
+   revision 
+
+test bad subpaths pattern
 
-echo '% test bad subpaths pattern'
-cat > .hg/hgrc <<EOF
-[subpaths]
-.* = \1
-EOF
-hg debugsub 2>&1 | "$TESTDIR/filtertmp.py"
+  $ cat > .hg/hgrc <<EOF
+  > [subpaths]
+  > .* = \1
+  > EOF
+  $ hg debugsub
+  abort: bad subrepository pattern in .*/test-subrepo-paths.t/outer/.hg/hgrc:2: invalid group reference
 
-exit 0
+  $ exit 0