diff --git a/tests/test-remotefilelog-bgprefetch.t b/tests/test-remotefilelog-bgprefetch.t
--- a/tests/test-remotefilelog-bgprefetch.t
+++ b/tests/test-remotefilelog-bgprefetch.t
@@ -222,7 +222,7 @@
   $ clearcache
   $ find $CACHEDIR -type f | sort
   $ hg rebase -s temporary -d foo
-  rebasing 3:58147a5b5242 "b" (tip temporary)
+  rebasing 3:58147a5b5242 "b" (temporary tip)
   saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/58147a5b5242-c3678817-rebase.hg (glob)
   3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over *s (glob)
   $ sleep 1
diff --git a/tests/test-tweakdefaults-ordering.t b/tests/test-tweakdefaults-ordering.t
--- a/tests/test-tweakdefaults-ordering.t
+++ b/tests/test-tweakdefaults-ordering.t
@@ -24,7 +24,7 @@
   $ hg commit -Aqm c
   $ hg bookmark C -t AB
   $ hg rebase
-  rebasing 2:d5e255ef74f8 "c" (tip C)
+  rebasing 2:d5e255ef74f8 "c" (C tip)
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d5e255ef74f8-7d2cc323-rebase.hg (glob)
 
 
diff --git a/tests/test-tweakdefaults-remotenames.t b/tests/test-tweakdefaults-remotenames.t
--- a/tests/test-tweakdefaults-remotenames.t
+++ b/tests/test-tweakdefaults-remotenames.t
@@ -47,13 +47,13 @@
   pulling from $TESTTMP/repo (glob)
   searching for changes
   no changes found
-  rebasing 3:3de6bbccf693 "foo" (tip bm)
+  rebasing 3:3de6bbccf693 "foo" (bm tip)
   saved backup bundle to $TESTTMP/clone/.hg/strip-backup/3de6bbccf693-0dce0663-rebase.hg (glob)
   $ hg pull --rebase --dest three
   pulling from $TESTTMP/repo (glob)
   searching for changes
   no changes found
-  rebasing 3:54ac787ff1c5 "foo" (tip bm)
+  rebasing 3:54ac787ff1c5 "foo" (bm tip)
   saved backup bundle to $TESTTMP/clone/.hg/strip-backup/54ac787ff1c5-4c2ca3a1-rebase.hg (glob)
 
 Test that hg pull --update aborts without --dest
diff --git a/tests/test-undo.t b/tests/test-undo.t
--- a/tests/test-undo.t
+++ b/tests/test-undo.t
@@ -617,7 +617,7 @@
   > rebase =
   > EOF
   $ hg rebase -s 8057 -d 75f6
-  rebasing 17:805791ba4bcd "newbranch" (tip newbook)
+  rebasing 17:805791ba4bcd "newbranch" (newbook tip)
   $ hg log -l 2
   changeset:   18:35324a911c0d
   bookmark:    newbook