diff -r 4a359b8f8fae -r 8353d154a9bd tests/test-shelve.t
--- a/tests/test-shelve.t	Fri Apr 15 22:37:52 2016 -0400
+++ b/tests/test-shelve.t	Fri Apr 15 22:53:53 2016 -0400
@@ -1497,8 +1497,10 @@
 running 'shelve --continue' the branch information won't be
 restored and branch will be unchanged.
 
-  $ hg init shelve_on_new_branch_conflict_with_previous_shelvedstate
-  $ cd shelve_on_new_branch_conflict_with_previous_shelvedstate
+shelve on new branch, conflict with previous shelvedstate
+
+  $ hg init conflict
+  $ cd conflict
   $ echo "aaa" >> a
   $ hg commit -A -m "a"
   adding a