diff --git a/tests/test-schemes.out b/tests/test-schemes.out
deleted file mode 100644
--- a/tests/test-schemes.out
+++ /dev/null
@@ -1,16 +0,0 @@
-adding a
-comparing with l://
-searching for changes
-no changes found
-% check that {1} syntax works
-using http://localhost:/
-sending between command
-comparing with parts://localhost
-sending heads command
-searching for changes
-no changes found
-% check that paths are expanded
-comparing with z://
-searching for changes
-no changes found
-% errors
diff --git a/tests/test-schemes b/tests/test-schemes.t
old mode 100755
new mode 100644
rename from tests/test-schemes
rename to tests/test-schemes.t
--- a/tests/test-schemes
+++ b/tests/test-schemes.t
@@ -1,30 +1,45 @@
-#!/bin/sh
 
-cat <<EOF >> $HGRCPATH
-[extensions]
-schemes=
-
-[schemes]
-l = http://localhost:$HGPORT/
-parts = http://{1}:$HGPORT/
-z = file:\$PWD/
-EOF
+  $ cat <<EOF >> $HGRCPATH
+  > [extensions]
+  > schemes=
+  > 
+  > [schemes]
+  > l = http://localhost:$HGPORT/
+  > parts = http://{1}:$HGPORT/
+  > z = file:\$PWD/
+  > EOF
+  $ hg init test
+  $ cd test
+  $ echo a > a
+  $ hg ci -Am initial
+  adding a
+  $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
+  $ cat hg.pid >> $DAEMON_PIDS
+  $ hg incoming l://
+  comparing with l://
+  searching for changes
+  no changes found
+  [1]
 
-hg init test
-cd test
-echo a > a
-hg ci -Am initial
+check that {1} syntax works
 
-hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
-cat hg.pid >> $DAEMON_PIDS
+  $ hg incoming --debug parts://localhost
+  using http://localhost:*/ (glob)
+  sending between command
+  comparing with parts://localhost
+  sending heads command
+  searching for changes
+  no changes found
+  [1]
 
-hg incoming l://
-
-echo % check that {1} syntax works
-hg incoming --debug parts://localhost | sed 's/[0-9]//g'
+check that paths are expanded
 
-echo % check that paths are expanded
-PWD=`pwd` hg incoming z://
+  $ PWD=`pwd` hg incoming z://
+  comparing with z://
+  searching for changes
+  no changes found
+  [1]
 
-echo % errors
-cat errors.log
+errors
+
+  $ cat errors.log