--- a/tests/test-prev-next.t	Wed Jun 24 19:42:01 2015 -0700
+++ b/tests/test-prev-next.t	Wed Jun 24 20:06:45 2015 -0700
@@ -147,12 +147,12 @@
   1 new unstable changesets
   $ hg next
   no children
-  (1 unstable changesets to be evolved here, do you want to evolve?)
+  (1 unstable changesets to be evolved here, do you want --evolve?)
   [1]
-  $ hg evolve
+  $ hg next --evolve
   move:[2] added c
   atop:[3] added b (2)
-  working directory is now at e3b6d5df389b
+  working directory now at e3b6d5df389b
 
 next with ambiguity
 
@@ -179,12 +179,14 @@
   2 new unstable changesets
   $ hg next
   no children
-  (2 unstable changesets to be evolved here, do you want to evolve?)
+  (2 unstable changesets to be evolved here, do you want --evolve?)
   [1]
-  $ hg evolve
-  abort: multiple evolve candidates
-  (select one of e3b6d5df389b, 9df671ccd2c7 with --rev)
-  [255]
+  $ hg next --evolve
+  ambigious next (unstable) changeset:
+  [4] added c
+  [5] added d
+  (run "hg evolve --rev REV" on one of them)
+  [1]
   $ hg evolve -r 5
   move:[5] added d
   atop:[6] added b (3)