diff --git a/tests/test-flags.out b/tests/test-flags.out
deleted file mode 100644
--- a/tests/test-flags.out
+++ /dev/null
@@ -1,100 +0,0 @@
-updating to branch default
-2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-pulling from ../test1
-requesting all changes
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 2 changes to 2 files
-(run 'hg update' to get a working copy)
-2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-% the changelog should mention file a:
-a
-pulling from ../test2
-searching for changes
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 0 changes to 0 files (+1 heads)
-(run 'hg heads' to see heads, 'hg merge' to merge)
-changeset:   2:37dccb76c058
-tag:         tip
-parent:      0:4536b1c2ca69
-user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
-summary:     chmod +x a
-
-changeset:   1:a187cb361a5a
-user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
-summary:     a updated
-
-changeset:   2:37dccb76c058
-tag:         tip
-parent:      0:4536b1c2ca69
-user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
-summary:     chmod +x a
-
-changeset:   1:a187cb361a5a
-user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
-summary:     a updated
-
-changeset:   0:4536b1c2ca69
-user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
-summary:     added a b
-
-resolving manifests
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
-pulling from ../test2
-searching for changes
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 0 changes to 0 files (+1 heads)
-(run 'hg heads' to see heads, 'hg merge' to merge)
-changeset:   2:37dccb76c058
-tag:         tip
-parent:      0:4536b1c2ca69
-user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
-summary:     chmod +x a
-
-changeset:   1:d54568174d8e
-user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
-summary:     b updated
-
-changeset:   2:37dccb76c058
-tag:         tip
-parent:      0:4536b1c2ca69
-user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
-summary:     chmod +x a
-
-changeset:   1:d54568174d8e
-user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
-summary:     b updated
-
-changeset:   0:4536b1c2ca69
-user:        test
-date:        Mon Jan 12 13:46:40 1970 +0000
-summary:     added a b
-
-resolving manifests
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
--rwxr-x---
--rwxr-x---
--rwxr-x---
-   rev    offset  length   base linkrev nodeid       p1           p2
-     0         0       0      0       0 b80de5d13875 000000000000 000000000000
-   rev    offset  length   base linkrev nodeid       p1           p2
-     0         0       0      0       0 b80de5d13875 000000000000 000000000000
-   rev    offset  length   base linkrev nodeid       p1           p2
-     0         0       0      0       0 b80de5d13875 000000000000 000000000000
-     1         0       5      1       1 7fe919cc0336 b80de5d13875 000000000000
diff --git a/tests/test-flags b/tests/test-flags.t
old mode 100755
new mode 100644
rename from tests/test-flags
rename to tests/test-flags.t
--- a/tests/test-flags
+++ b/tests/test-flags.t
@@ -1,50 +1,149 @@
-#!/bin/sh -e
+  $ umask 027
+  $ mkdir test1
+  $ cd test1
 
-umask 027
-mkdir test1
-cd test1
+  $ hg init
+  $ touch a b
+  $ hg add a b
+  $ hg ci -m "added a b" -d "1000000 0"
 
-hg init
-touch a b
-hg add a b
-hg ci -m "added a b" -d "1000000 0"
+  $ cd ..
+  $ hg clone test1 test3
+  updating to branch default
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ mkdir test2
+  $ cd test2
 
-cd ..
-hg clone test1 test3
-mkdir test2
-cd test2
+  $ hg init
+  $ hg pull ../test1
+  pulling from ../test1
+  requesting all changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 1 changesets with 2 changes to 2 files
+  (run 'hg update' to get a working copy)
+  $ hg co
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ chmod +x a
+  $ hg ci -m "chmod +x a" -d "1000000 0"
 
-hg init
-hg pull ../test1
-hg co
-chmod +x a
-hg ci -m "chmod +x a" -d "1000000 0"
-echo % the changelog should mention file a:
-hg tip --template '{files}\n'
+the changelog should mention file a:
+
+  $ hg tip --template '{files}\n'
+  a
+
+  $ cd ../test1
+  $ echo 123 >>a
+  $ hg ci -m "a updated" -d "1000000 0"
 
-cd ../test1
-echo 123 >>a
-hg ci -m "a updated" -d "1000000 0"
+  $ hg pull ../test2
+  pulling from ../test2
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 1 changesets with 0 changes to 0 files (+1 heads)
+  (run 'hg heads' to see heads, 'hg merge' to merge)
+  $ hg heads
+  changeset:   2:37dccb76c058
+  tag:         tip
+  parent:      0:4536b1c2ca69
+  user:        test
+  date:        Mon Jan 12 13:46:40 1970 +0000
+  summary:     chmod +x a
+  
+  changeset:   1:a187cb361a5a
+  user:        test
+  date:        Mon Jan 12 13:46:40 1970 +0000
+  summary:     a updated
+  
+  $ hg history
+  changeset:   2:37dccb76c058
+  tag:         tip
+  parent:      0:4536b1c2ca69
+  user:        test
+  date:        Mon Jan 12 13:46:40 1970 +0000
+  summary:     chmod +x a
+  
+  changeset:   1:a187cb361a5a
+  user:        test
+  date:        Mon Jan 12 13:46:40 1970 +0000
+  summary:     a updated
+  
+  changeset:   0:4536b1c2ca69
+  user:        test
+  date:        Mon Jan 12 13:46:40 1970 +0000
+  summary:     added a b
+  
 
-hg pull ../test2
-hg heads
-hg history
+  $ hg -v merge
+  resolving manifests
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
 
-hg -v merge
+  $ cd ../test3
+  $ echo 123 >>b
+  $ hg ci -m "b updated" -d "1000000 0"
 
-cd ../test3
-echo 123 >>b
-hg ci -m "b updated" -d "1000000 0"
-
-hg pull ../test2
-hg heads
-hg history
+  $ hg pull ../test2
+  pulling from ../test2
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 1 changesets with 0 changes to 0 files (+1 heads)
+  (run 'hg heads' to see heads, 'hg merge' to merge)
+  $ hg heads
+  changeset:   2:37dccb76c058
+  tag:         tip
+  parent:      0:4536b1c2ca69
+  user:        test
+  date:        Mon Jan 12 13:46:40 1970 +0000
+  summary:     chmod +x a
+  
+  changeset:   1:d54568174d8e
+  user:        test
+  date:        Mon Jan 12 13:46:40 1970 +0000
+  summary:     b updated
+  
+  $ hg history
+  changeset:   2:37dccb76c058
+  tag:         tip
+  parent:      0:4536b1c2ca69
+  user:        test
+  date:        Mon Jan 12 13:46:40 1970 +0000
+  summary:     chmod +x a
+  
+  changeset:   1:d54568174d8e
+  user:        test
+  date:        Mon Jan 12 13:46:40 1970 +0000
+  summary:     b updated
+  
+  changeset:   0:4536b1c2ca69
+  user:        test
+  date:        Mon Jan 12 13:46:40 1970 +0000
+  summary:     added a b
+  
 
-hg -v merge
+  $ hg -v merge
+  resolving manifests
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
+
+  $ ls -l ../test[123]/a > foo
+  $ cut -b 1-10 < foo
+  -rwxr-x---
+  -rwxr-x---
+  -rwxr-x---
 
-ls -l ../test[123]/a > foo
-cut -b 1-10 < foo
-
-hg debugindex .hg/store/data/a.i
-hg debugindex ../test2/.hg/store/data/a.i
-hg debugindex ../test1/.hg/store/data/a.i
+  $ hg debugindex .hg/store/data/a.i
+     rev    offset  length   base linkrev nodeid       p1           p2
+       0         0       0      0       0 b80de5d13875 000000000000 000000000000
+  $ hg debugindex ../test2/.hg/store/data/a.i
+     rev    offset  length   base linkrev nodeid       p1           p2
+       0         0       0      0       0 b80de5d13875 000000000000 000000000000
+  $ hg debugindex ../test1/.hg/store/data/a.i
+     rev    offset  length   base linkrev nodeid       p1           p2
+       0         0       0      0       0 b80de5d13875 000000000000 000000000000
+       1         0       5      1       1 7fe919cc0336 b80de5d13875 000000000000