--- a/tests/test-evolve.t	Fri Feb 17 19:08:36 2012 +0100
+++ b/tests/test-evolve.t	Fri Feb 17 19:54:42 2012 +0100
@@ -199,6 +199,7 @@
   0	: base - test
 
   $ hg up feature-A -q
+  $ hg bookmark -i feature-A
   $ sed -i'' -e s/Eins/Un/ main-file-1
 
   $ hg amend --note 'french looks better'
@@ -207,22 +208,14 @@
   4	feature-B: another feature - test
   1	: a nifty feature - test
   0	: base - test
-  $ hg stabilize
+  $ hg stabilize -n
+  move:[4] another feature
+  atop:[6] a nifty feature
   hg rebase -Dr f8111a076f09 -d 23409eba69a0
-  $ hg up null -q #prevent feature-A bookmark to move # XXX grml
-  $ hg bookmark
-     feature-A                 6:23409eba69a0
-     feature-B                 4:f8111a076f09
-  $ hg up 6
-  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg bookmark -if feature-A
-  $ hg bookmark
-     feature-A                 6:23409eba69a0
-     feature-B                 4:f8111a076f09
-  $ hg graft -O 4
-  grafting revision 4
+  $ hg stabilize
+  move:[4] another feature
+  atop:[6] a nifty feature
   merging main-file-1
-  $ hg bookmark -ifr 7 feature-B # XXX not bookmark support in rebase --keep :-/
   $ hg log
   7	feature-B: another feature - test
   6	feature-A: a nifty feature - test