--- a/hgext/reviewboard/tests/test-bugzilla.t
+++ b/hgext/reviewboard/tests/test-bugzilla.t
@@ -96,17 +96,17 @@ Publishing the review will add an attach
     status: NEW
     summary: bug1
 
 We should only display the full commit description the first time it is
 published.
 
   $ echo foo1 >> foo
   $ hg commit --amend
-  saved backup bundle to $TESTTMP/client/.hg/strip-backup/98467d80785e-96ff1ede-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/client/.hg/strip-backup/98467d80785e-*.hg (glob)
   $ hg push --config reviewboard.autopublish=false
   pushing to ssh://$DOCKER_HOSTNAME:$HGPORT6/test-repo
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
   remote: recorded push in pushlog

--- a/hgext/reviewboard/tests/test-commit-message-as-file.t
+++ b/hgext/reviewboard/tests/test-commit-message-as-file.t
@@ -78,17 +78,17 @@ Commit extra data fields should be creat
     - ''
   approved: false
   approval_failure: A suitable reviewer has not given a "Ship It!"
 
 Amended commit message should result with a changed commit message ids extra 
 data, filename should remain the same.
 
   $ hg commit --amend -m 'Bug 1 - Foo 2 - amended'
-  saved backup bundle to $TESTTMP/client/.hg/strip-backup/4a9cf7e91820-f76b5126-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/client/.hg/strip-backup/4a9cf7e91820-f76b5126-*.hg (glob)
   $ hg push
   pushing to ssh://$DOCKER_HOSTNAME:$HGPORT6/test-repo
   (adding commit id to 1 changesets)
   saved backup bundle to $TESTTMP/client/.hg/strip-backup/2358ed0ad9b5-42479a45-addcommitid.hg (glob)
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes

--- a/hgext/reviewboard/tests/test-commit-message-file-old-structure.t
+++ b/hgext/reviewboard/tests/test-commit-message-file-old-structure.t
@@ -93,17 +93,17 @@ remove commit message entries from datab
     - +foo1
     - ''
   approved: false
   approval_failure: A suitable reviewer has not given a "Ship It!"
 
 Ammending commit should not create a commit message FileDiff
   $ echo foo2 > foo.h
   $ hg commit --amend -m 'Bug 1 - Foo 2'
-  saved backup bundle to $TESTTMP/client/.hg/strip-backup/4a9cf7e91820-a2ac3612-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/client/.hg/strip-backup/4a9cf7e91820-*.hg (glob)
   $ hg push -y
   pushing to ssh://$DOCKER_HOSTNAME:$HGPORT6/test-repo
   (adding commit id to 1 changesets)
   saved backup bundle to $TESTTMP/client/.hg/strip-backup/ecf3ba3ae44d-df5ba11c-addcommitid.hg (glob)
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes

--- a/hgext/reviewboard/tests/test-commitid.t
+++ b/hgext/reviewboard/tests/test-commitid.t
@@ -36,17 +36,17 @@ Commit ID should be present after review
 Verify commit IDs survive rebasing
 
   $ hg -q up -r 0
   $ touch bar
   $ hg -q commit -A -m 'head 2'
 
   $ hg rebase -s 1 -d 2
   rebasing 1:306d1563179b "commit 1"
-  saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/*-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/*.hg (glob)
 
   $ hg log -G -T '{rev}:{node|short} {desc}\n'
   o  2:ae4a1eb0e7a0 commit 1
   |
   |  MozReview-Commit-ID: 124Bxg
   @  1:8a14d300d449 head 2
   |
   |  MozReview-Commit-ID: 5ijR9k
@@ -81,17 +81,17 @@ Histedit should preserve commit ids when
 
   $ cat >> commands << EOF
   > p 4a17019033eb
   > p 0aa5a5b9a166
   > p bb89e4592815
   > EOF
 
   $ hg histedit -r 4a17019033eb --commands commands | grep -v 'files updated'
-  saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/bb89e4592815-c4460a5c-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/bb89e4592815-c4460a5c-*.hg (glob)
 
   $ hg log -G -T '{rev}:{node|short} {desc}\n' -r '::.'
   @  5:986c4bf069fe histedit2
   |
   |  MozReview-Commit-ID: F63vXs
   o  4:84bc2f59c8ec histedit3
   |
   |  MozReview-Commit-ID: JmjAjw

--- a/hgext/reviewboard/tests/test-review-request-summary.t
+++ b/hgext/reviewboard/tests/test-review-request-summary.t
@@ -302,17 +302,17 @@ Verify that we get nothing from non-exis
   $ rbmanage dump-summaries-by-bug 2
   []
 
 Create a draft with different diffstats
 
   $ echo "more foo" >> foo
   $ echo "and even more" >> foo
   $ hg commit --amend
-  saved backup bundle to $TESTTMP/client/.hg/strip-backup/*-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/client/.hg/strip-backup/*.hg (glob)
   $ hg push --config reviewboard.autopublish=false
   pushing to ssh://$DOCKER_HOSTNAME:$HGPORT6/test-repo
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
   remote: recorded push in pushlog

--- a/hgext/reviewboard/tests/test-reviewer-flags.t
+++ b/hgext/reviewboard/tests/test-reviewer-flags.t
@@ -58,17 +58,17 @@ There are no warnings for reviewers who 
   created review 1
   $ exportbzauth default@example.com password
   $ echo foo >> foo
   $ hg commit --amend -l - << EOF
   > bug 1 - serious changes; r=cthulhu
   > 
   > MozReview-Commit-ID: 124Bxg
   > EOF
-  saved backup bundle to $TESTTMP/client/.hg/strip-backup/9131d64aca84-c977e83b-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/client/.hg/strip-backup/9131d64aca84-*.hg (glob)
   $ hg push
   pushing to ssh://$DOCKER_HOSTNAME:$HGPORT6/test-repo
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
   remote: recorded push in pushlog
@@ -97,17 +97,17 @@ using r=.
 
   $ exportbzauth default@example.com password
   $ echo foo >> foo
   $ hg commit --amend -l - << EOF
   > bug 1 - even better stuff; r=cthulhu
   > 
   > MozReview-Commit-ID: APOgLo
   > EOF
-  saved backup bundle to $TESTTMP/client/.hg/strip-backup/f6ca9a9341fc-3ca96401-amend-backup.hg (glob)
+  saved backup bundle to $TESTTMP/client/.hg/strip-backup/f6ca9a9341fc-*.hg (glob)
   $ hg push
   pushing to ssh://$DOCKER_HOSTNAME:$HGPORT6/test-repo
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
   remote: recorded push in pushlog