--- a/tests/test-evolve-issue5966.t	Wed Apr 24 16:35:01 2019 +0800
+++ b/tests/test-evolve-issue5966.t	Wed Apr 24 17:02:27 2019 +0800
@@ -54,7 +54,7 @@
   o  0: empty
   
 
-  $ hg evolve -t :fail
+  $ hg evolve -t :fail --rev 'first(orphan())'
   move:[2] banana
   atop:[4] apricot
   fix conflicts and see `hg help evolve.interrupted`

--- a/tests/test-evolve.t	Wed Apr 24 16:35:01 2019 +0800
+++ b/tests/test-evolve.t	Wed Apr 24 17:02:27 2019 +0800
@@ -924,7 +924,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg amend -m 'a1_'
   2 new orphan changesets
-  $ hg evolve
+  $ hg evolve --rev 'first(orphan())'
   move:[4] a2
   atop:[6] a1_
   $ hg evolve
@@ -972,7 +972,7 @@
   $ ls .hg/bookmarks*
   .hg/bookmarks
   .hg/bookmarks.* (glob)
-  $ hg evolve
+  $ hg evolve --rev 'first(orphan())'
   move:[7] a2
   atop:[9] a1__
   (leaving bookmark testbookmark)

--- a/tests/test-stabilize-order.t	Wed Apr 24 16:35:01 2019 +0800
+++ b/tests/test-stabilize-order.t	Wed Apr 24 17:02:27 2019 +0800
@@ -62,7 +62,7 @@
 
 Test stabilizing a predecessor child
 
-  $ hg evolve -v
+  $ hg evolve -v --rev 'last(orphan())'
   move:[4] addb
   atop:[5] adda
   hg rebase -r 22619daeed78 -d 005fe5914f78