diff --git a/tests/test-histedit-obsolete.t b/tests/test-histedit-obsolete.t
--- a/tests/test-histedit-obsolete.t
+++ b/tests/test-histedit-obsolete.t
@@ -148,6 +148,7 @@ Test that rewriting leaving instability 
 stabilise
 
   $ hg rebase  -r 'unstable()' -d .
+  $ hg up tip -q
 
 Test dropping of changeset on the top of the stack
 -------------------------------------------------------
diff --git a/tests/test-rebase-collapse.t b/tests/test-rebase-collapse.t
--- a/tests/test-rebase-collapse.t
+++ b/tests/test-rebase-collapse.t
@@ -71,7 +71,7 @@ Rebasing B onto H and collapsing changes
   |/
   o  0:draft 'A'
   
-  $ hg manifest
+  $ hg manifest --rev tip
   A
   B
   C
@@ -107,7 +107,7 @@ Rebasing E onto H:
   |/
   o  0: 'A'
   
-  $ hg manifest
+  $ hg manifest --rev tip
   A
   E
   F
@@ -142,7 +142,7 @@ Rebasing G onto H with custom message:
   |/
   o  0: 'A'
   
-  $ hg manifest
+  $ hg manifest --rev tip
   A
   E
   F
@@ -249,7 +249,7 @@ Rebase and collapse - E onto H:
   |/
   o  0: 'A'
   
-  $ hg manifest
+  $ hg manifest --rev tip
   A
   C
   D
@@ -399,7 +399,7 @@ Rebase and collapse - E onto I:
   |/
   o  0: 'A'
   
-  $ hg manifest
+  $ hg manifest --rev tip
   A
   C
   D
@@ -407,6 +407,7 @@ Rebase and collapse - E onto I:
   G
   I
 
+  $ hg up tip -q
   $ cat E
   F
 
@@ -481,7 +482,7 @@ Rebase and collapse - B onto F:
   |
   o  0: 'A'
   
-  $ hg manifest
+  $ hg manifest --rev tip
   A
   B
   C
@@ -611,12 +612,13 @@ Rebase, collapse and copies
   merging f and c to c
   saved backup bundle to $TESTTMP/copies/.hg/strip-backup/*-backup.hg (glob)
   $ hg st
-  $ hg st --copies --change .
+  $ hg st --copies --change tip
   A d
     a
   A g
     b
   R b
+  $ hg up tip -q
   $ cat c
   c
   c
@@ -648,7 +650,7 @@ Test collapsing in place
 
   $ hg rebase --collapse -b . -d 0
   saved backup bundle to $TESTTMP/copies/.hg/strip-backup/*-backup.hg (glob)
-  $ hg st --change . --copies
+  $ hg st --change tip --copies
   M a
   M c
   A d
@@ -656,6 +658,7 @@ Test collapsing in place
   A g
     b
   R b
+  $ hg up tip -q
   $ cat a
   a
   a
@@ -741,7 +744,7 @@ Test collapsing changes that add then re
   |
   o  0: 'base'
   
-  $ hg manifest
+  $ hg manifest --rev tip
   b
   base
 
diff --git a/tests/test-rebase-detach.t b/tests/test-rebase-detach.t
--- a/tests/test-rebase-detach.t
+++ b/tests/test-rebase-detach.t
@@ -68,7 +68,7 @@ Rebasing D onto H detaching from C:
   |/
   o  0:draft 'A'
   
-  $ hg manifest
+  $ hg manifest --rev tip
   A
   D
   F
@@ -119,7 +119,7 @@ Rebasing C onto H detaching from B:
   |/
   o  0: 'A'
   
-  $ hg manifest
+  $ hg manifest --rev tip
   A
   C
   D
@@ -171,7 +171,7 @@ Rebasing B onto H using detach (same as 
   |/
   o  0: 'A'
   
-  $ hg manifest
+  $ hg manifest --rev tip
   A
   B
   C
@@ -224,7 +224,7 @@ Rebasing C onto H detaching from B and c
   |/
   o  0:draft 'A'
   
-  $ hg manifest
+  $ hg manifest --rev tip
   A
   C
   D
@@ -350,7 +350,7 @@ Verify that target is not selected as ex
   o  0: 'A'
   
 
-  $ hg parents
+  $ hg log --rev tip
   changeset:   8:9472f4b1d736
   tag:         tip
   user:        test
diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t
--- a/tests/test-rebase-obsolete.t
+++ b/tests/test-rebase-obsolete.t
@@ -283,7 +283,7 @@ collapse rebase
   |/
   o  0:cd010b8cd998 A
   
-  $ hg id --debug
+  $ hg id --debug -r tip
   4dc2197e807bae9817f09905b50ab288be2dbbcf tip
   $ hg debugobsolete
   42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 4dc2197e807bae9817f09905b50ab288be2dbbcf 0 {'date': '*', 'user': 'test'} (glob)