diff --git a/tests/test-mq-strip.out b/tests/test-mq-strip.out
deleted file mode 100644
--- a/tests/test-mq-strip.out
+++ /dev/null
@@ -1,278 +0,0 @@
-adding bar
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-created new head
-changeset:   4:443431ffac4f
-tag:         tip
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     e
-
-changeset:   3:65bd5f99a4a3
-parent:      1:ef3a871183d7
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     d
-
-changeset:   2:264128213d29
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     c
-
-changeset:   1:ef3a871183d7
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     b
-
-changeset:   0:9ab35a2d17cb
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     a
-
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-% before update 4, strip 4
-changeset:   4:443431ffac4f
-tag:         tip
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     e
-
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-saved backup bundle to 
-% after update 4, strip 4
-changeset:   3:65bd5f99a4a3
-tag:         tip
-parent:      1:ef3a871183d7
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     d
-
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-% before update 4, strip 3
-changeset:   4:443431ffac4f
-tag:         tip
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     e
-
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-saved backup bundle to 
-% after update 4, strip 3
-changeset:   1:ef3a871183d7
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     b
-
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-% before update 1, strip 4
-changeset:   1:ef3a871183d7
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     b
-
-saved backup bundle to 
-% after update 1, strip 4
-changeset:   1:ef3a871183d7
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     b
-
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-% before update 4, strip 2
-changeset:   4:443431ffac4f
-tag:         tip
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     e
-
-saved backup bundle to 
-% after update 4, strip 2
-changeset:   3:443431ffac4f
-tag:         tip
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     e
-
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-% before update 4, strip 1
-changeset:   4:264128213d29
-tag:         tip
-parent:      1:ef3a871183d7
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     c
-
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-saved backup bundle to 
-% after update 4, strip 1
-changeset:   0:9ab35a2d17cb
-tag:         tip
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     a
-
-0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-% before update null, strip 4
-saved backup bundle to 
-% after update null, strip 4
-changeset:   4:264128213d29
-tag:         tip
-parent:      1:ef3a871183d7
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     c
-
-changeset:   3:443431ffac4f
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     e
-
-changeset:   2:65bd5f99a4a3
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     d
-
-changeset:   1:ef3a871183d7
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     b
-
-changeset:   0:9ab35a2d17cb
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     a
-
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
-% before strip of merge parent
-changeset:   2:65bd5f99a4a3
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     d
-
-changeset:   4:264128213d29
-tag:         tip
-parent:      1:ef3a871183d7
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     c
-
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-saved backup bundle to 
-% after strip of merge parent
-changeset:   1:ef3a871183d7
-user:        test
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     b
-
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-@  changeset:   4:264128213d29
-|  tag:         tip
-|  parent:      1:ef3a871183d7
-|  user:        test
-|  date:        Thu Jan 01 00:00:00 1970 +0000
-|  summary:     c
-|
-| o  changeset:   3:443431ffac4f
-| |  user:        test
-| |  date:        Thu Jan 01 00:00:00 1970 +0000
-| |  summary:     e
-| |
-| o  changeset:   2:65bd5f99a4a3
-|/   user:        test
-|    date:        Thu Jan 01 00:00:00 1970 +0000
-|    summary:     d
-|
-o  changeset:   1:ef3a871183d7
-|  user:        test
-|  date:        Thu Jan 01 00:00:00 1970 +0000
-|  summary:     b
-|
-o  changeset:   0:9ab35a2d17cb
-   user:        test
-   date:        Thu Jan 01 00:00:00 1970 +0000
-   summary:     a
-
-% 2 is parent of 3, only one strip should happen
-saved backup bundle to 
-@  changeset:   2:264128213d29
-|  tag:         tip
-|  user:        test
-|  date:        Thu Jan 01 00:00:00 1970 +0000
-|  summary:     c
-|
-o  changeset:   1:ef3a871183d7
-|  user:        test
-|  date:        Thu Jan 01 00:00:00 1970 +0000
-|  summary:     b
-|
-o  changeset:   0:9ab35a2d17cb
-   user:        test
-   date:        Thu Jan 01 00:00:00 1970 +0000
-   summary:     a
-
-o  changeset:   4:443431ffac4f
-|  tag:         tip
-|  user:        test
-|  date:        Thu Jan 01 00:00:00 1970 +0000
-|  summary:     e
-|
-o  changeset:   3:65bd5f99a4a3
-|  parent:      1:ef3a871183d7
-|  user:        test
-|  date:        Thu Jan 01 00:00:00 1970 +0000
-|  summary:     d
-|
-| @  changeset:   2:264128213d29
-|/   user:        test
-|    date:        Thu Jan 01 00:00:00 1970 +0000
-|    summary:     c
-|
-o  changeset:   1:ef3a871183d7
-|  user:        test
-|  date:        Thu Jan 01 00:00:00 1970 +0000
-|  summary:     b
-|
-o  changeset:   0:9ab35a2d17cb
-   user:        test
-   date:        Thu Jan 01 00:00:00 1970 +0000
-   summary:     a
-
-% 2 different branches: 2 strips
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-saved backup bundle to 
-saved backup bundle to 
-@  changeset:   2:65bd5f99a4a3
-|  tag:         tip
-|  user:        test
-|  date:        Thu Jan 01 00:00:00 1970 +0000
-|  summary:     d
-|
-o  changeset:   1:ef3a871183d7
-|  user:        test
-|  date:        Thu Jan 01 00:00:00 1970 +0000
-|  summary:     b
-|
-o  changeset:   0:9ab35a2d17cb
-   user:        test
-   date:        Thu Jan 01 00:00:00 1970 +0000
-   summary:     a
-
-% 2 different branches and a common ancestor: 1 strip
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-saved backup bundle to 
-saved backup bundle to 
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-% applied patches before strip
-2.diff
-3.diff
-4.diff
-% stripping revision in queue
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-saved backup bundle to 
-% applied patches after stripping rev in queue
-2.diff
-% stripping ancestor of queue
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-saved backup bundle to 
-% applied patches after stripping ancestor of queue
diff --git a/tests/test-mq-strip b/tests/test-mq-strip.t
old mode 100755
new mode 100644
rename from tests/test-mq-strip
rename to tests/test-mq-strip.t
--- a/tests/test-mq-strip
+++ b/tests/test-mq-strip.t
@@ -1,94 +1,382 @@
-#!/bin/sh
+  $ echo "[extensions]" >> $HGRCPATH
+  $ echo "mq=" >> $HGRCPATH
+  $ echo "graphlog=" >> $HGRCPATH
 
-. $TESTDIR/helpers.sh
+  $ restore() {
+  >     hg unbundle -q .hg/strip-backup/*
+  >     rm .hg/strip-backup/*
+  > }
+  $ teststrip() {
+  >     hg up -C $1
+  >     echo % before update $1, strip $2
+  >     hg parents
+  >     hg --traceback strip $2
+  >     echo % after update $1, strip $2
+  >     hg parents
+  >     restore
+  > }
+
+  $ hg init test
+  $ cd test
+
+  $ echo foo > bar
+  $ hg ci -Ama
+  adding bar
+
+  $ echo more >> bar
+  $ hg ci -Amb
+
+  $ echo blah >> bar
+  $ hg ci -Amc
 
-echo "[extensions]" >> $HGRCPATH
-echo "mq=" >> $HGRCPATH
-echo "graphlog=" >> $HGRCPATH
+  $ hg up 1
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ echo blah >> bar
+  $ hg ci -Amd
+  created new head
+
+  $ echo final >> bar
+  $ hg ci -Ame
+
+  $ hg log
+  changeset:   4:443431ffac4f
+  tag:         tip
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     e
+  
+  changeset:   3:65bd5f99a4a3
+  parent:      1:ef3a871183d7
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     d
+  
+  changeset:   2:264128213d29
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     c
+  
+  changeset:   1:ef3a871183d7
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     b
+  
+  changeset:   0:9ab35a2d17cb
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     a
+  
 
-restore() {
-    hg unbundle -q .hg/strip-backup/*
-    rm .hg/strip-backup/*
-}
-teststrip() {
-    hg up -C $1
-    echo % before update $1, strip $2
-    hg parents
-    hg --traceback strip $2 | hidebackup
-    echo % after update $1, strip $2
-    hg parents
-    restore
-}
-
-hg init test
-cd test
+  $ teststrip 4 4
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  % before update 4, strip 4
+  changeset:   4:443431ffac4f
+  tag:         tip
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     e
+  
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  saved backup bundle to .*
+  % after update 4, strip 4
+  changeset:   3:65bd5f99a4a3
+  tag:         tip
+  parent:      1:ef3a871183d7
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     d
+  
+  $ teststrip 4 3
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  % before update 4, strip 3
+  changeset:   4:443431ffac4f
+  tag:         tip
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     e
+  
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  saved backup bundle to .*
+  % after update 4, strip 3
+  changeset:   1:ef3a871183d7
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     b
+  
+  $ teststrip 1 4
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  % before update 1, strip 4
+  changeset:   1:ef3a871183d7
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     b
+  
+  saved backup bundle to .*
+  % after update 1, strip 4
+  changeset:   1:ef3a871183d7
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     b
+  
+  $ teststrip 4 2
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  % before update 4, strip 2
+  changeset:   4:443431ffac4f
+  tag:         tip
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     e
+  
+  saved backup bundle to .*
+  % after update 4, strip 2
+  changeset:   3:443431ffac4f
+  tag:         tip
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     e
+  
+  $ teststrip 4 1
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  % before update 4, strip 1
+  changeset:   4:264128213d29
+  tag:         tip
+  parent:      1:ef3a871183d7
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     c
+  
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  saved backup bundle to .*
+  % after update 4, strip 1
+  changeset:   0:9ab35a2d17cb
+  tag:         tip
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     a
+  
+  $ teststrip null 4
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  % before update null, strip 4
+  saved backup bundle to .*
+  % after update null, strip 4
 
-echo foo > bar
-hg ci -Ama
-
-echo more >> bar
-hg ci -Amb
-
-echo blah >> bar
-hg ci -Amc
-
-hg up 1
-echo blah >> bar
-hg ci -Amd
-
-echo final >> bar
-hg ci -Ame
-
-hg log
+  $ hg log
+  changeset:   4:264128213d29
+  tag:         tip
+  parent:      1:ef3a871183d7
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     c
+  
+  changeset:   3:443431ffac4f
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     e
+  
+  changeset:   2:65bd5f99a4a3
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     d
+  
+  changeset:   1:ef3a871183d7
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     b
+  
+  changeset:   0:9ab35a2d17cb
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     a
+  
 
-teststrip 4 4
-teststrip 4 3
-teststrip 1 4
-teststrip 4 2
-teststrip 4 1
-teststrip null 4
+  $ hg up -C 2
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg merge 4
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
+
+before strip of merge parent
 
-hg log
+  $ hg parents
+  changeset:   2:65bd5f99a4a3
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     d
+  
+  changeset:   4:264128213d29
+  tag:         tip
+  parent:      1:ef3a871183d7
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     c
+  
+  $ hg strip 4
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  saved backup bundle to .*
+
+after strip of merge parent
 
-hg up -C 2
-hg merge 4
-echo % before strip of merge parent
-hg parents
-hg strip 4 2>&1 | hidebackup
-echo % after strip of merge parent
-hg parents
-restore
+  $ hg parents
+  changeset:   1:ef3a871183d7
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     b
+  
+  $ restore
+
+  $ hg up
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg glog
+  @  changeset:   4:264128213d29
+  |  tag:         tip
+  |  parent:      1:ef3a871183d7
+  |  user:        test
+  |  date:        Thu Jan 01 00:00:00 1970 +0000
+  |  summary:     c
+  |
+  | o  changeset:   3:443431ffac4f
+  | |  user:        test
+  | |  date:        Thu Jan 01 00:00:00 1970 +0000
+  | |  summary:     e
+  | |
+  | o  changeset:   2:65bd5f99a4a3
+  |/   user:        test
+  |    date:        Thu Jan 01 00:00:00 1970 +0000
+  |    summary:     d
+  |
+  o  changeset:   1:ef3a871183d7
+  |  user:        test
+  |  date:        Thu Jan 01 00:00:00 1970 +0000
+  |  summary:     b
+  |
+  o  changeset:   0:9ab35a2d17cb
+     user:        test
+     date:        Thu Jan 01 00:00:00 1970 +0000
+     summary:     a
+  
+
+2 is parent of 3, only one strip should happen
 
-hg up
-hg glog
-echo % 2 is parent of 3, only one strip should happen
-hg strip 2 3 | hidebackup
-hg glog
-restore
-hg glog
-echo % 2 different branches: 2 strips
-hg strip 2 4 | hidebackup
-hg glog
-restore
-echo % 2 different branches and a common ancestor: 1 strip
-hg strip 1 2 4 | hidebackup
-restore
+  $ hg strip 2 3
+  saved backup bundle to .*
+  $ hg glog
+  @  changeset:   2:264128213d29
+  |  tag:         tip
+  |  user:        test
+  |  date:        Thu Jan 01 00:00:00 1970 +0000
+  |  summary:     c
+  |
+  o  changeset:   1:ef3a871183d7
+  |  user:        test
+  |  date:        Thu Jan 01 00:00:00 1970 +0000
+  |  summary:     b
+  |
+  o  changeset:   0:9ab35a2d17cb
+     user:        test
+     date:        Thu Jan 01 00:00:00 1970 +0000
+     summary:     a
+  
+  $ restore
+  $ hg glog
+  o  changeset:   4:443431ffac4f
+  |  tag:         tip
+  |  user:        test
+  |  date:        Thu Jan 01 00:00:00 1970 +0000
+  |  summary:     e
+  |
+  o  changeset:   3:65bd5f99a4a3
+  |  parent:      1:ef3a871183d7
+  |  user:        test
+  |  date:        Thu Jan 01 00:00:00 1970 +0000
+  |  summary:     d
+  |
+  | @  changeset:   2:264128213d29
+  |/   user:        test
+  |    date:        Thu Jan 01 00:00:00 1970 +0000
+  |    summary:     c
+  |
+  o  changeset:   1:ef3a871183d7
+  |  user:        test
+  |  date:        Thu Jan 01 00:00:00 1970 +0000
+  |  summary:     b
+  |
+  o  changeset:   0:9ab35a2d17cb
+     user:        test
+     date:        Thu Jan 01 00:00:00 1970 +0000
+     summary:     a
+  
+
+2 different branches: 2 strips
 
-# remove branchy history for qimport tests
-hg strip 3 | hidebackup
+  $ hg strip 2 4
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  saved backup bundle to .*
+  saved backup bundle to .*
+  $ hg glog
+  @  changeset:   2:65bd5f99a4a3
+  |  tag:         tip
+  |  user:        test
+  |  date:        Thu Jan 01 00:00:00 1970 +0000
+  |  summary:     d
+  |
+  o  changeset:   1:ef3a871183d7
+  |  user:        test
+  |  date:        Thu Jan 01 00:00:00 1970 +0000
+  |  summary:     b
+  |
+  o  changeset:   0:9ab35a2d17cb
+     user:        test
+     date:        Thu Jan 01 00:00:00 1970 +0000
+     summary:     a
+  
+  $ restore
+
+2 different branches and a common ancestor: 1 strip
+
+  $ hg strip 1 2 4
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  saved backup bundle to .*
+  $ restore
+
+
+remove branchy history for qimport tests
+
+  $ hg strip 3
+  saved backup bundle to .*
 
-#strip of applied mq should cleanup status file
-hg up -C 3
-echo fooagain >> bar
-hg ci -mf
-hg qimport -r tip:2
-echo % applied patches before strip
-hg qapplied
-echo % stripping revision in queue
-hg strip 3 | hidebackup
-echo % applied patches after stripping rev in queue
-hg qapplied
-echo % stripping ancestor of queue
-hg strip 1 | hidebackup
-echo % applied patches after stripping ancestor of queue
-hg qapplied
+
+strip of applied mq should cleanup status file
+
+  $ hg up -C 3
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ echo fooagain >> bar
+  $ hg ci -mf
+  $ hg qimport -r tip:2
+
+applied patches before strip
+
+  $ hg qapplied
+  2.diff
+  3.diff
+  4.diff
+
+stripping revision in queue
+
+  $ hg strip 3
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  saved backup bundle to .*
+
+applied patches after stripping rev in queue
+
+  $ hg qapplied
+  2.diff
+
+stripping ancestor of queue
+
+  $ hg strip 1
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  saved backup bundle to .*
+
+applied patches after stripping ancestor of queue
+
+  $ hg qapplied