diff --git a/java/java-tests/testSrc/com/intellij/refactoring/RenameMethodMultiTest.java b/java/java-tests/testSrc/com/intellij/refactoring/RenameMethodMultiTest.java
index 18f0cbe22483..4247b3a8ab44 100644
--- a/java/java-tests/testSrc/com/intellij/refactoring/RenameMethodMultiTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/RenameMethodMultiTest.java
@@ -19,7 +19,6 @@ import com.intellij.JavaTestUtil;
 import com.intellij.lang.java.JavaLanguage;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
-import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.JavaPsiFacade;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiDocumentManager;
@@ -71,9 +70,9 @@ public class RenameMethodMultiTest extends MultiFileTestCase {
       doTest("p.B", "void method()", "finalMethod");
     }
     catch (BaseRefactoringProcessor.ConflictsInTestsException e) {
-      Assert.assertEquals("Renaming method will override final \"method <b><code>A.finalMethod()</code></b>\"\n" +
-                          "Method finalMethod() will override \n" +
-                          "a method of the base class <b><code>p.A</code></b>", e.getMessage());
+      Assert.assertEquals("Method finalMethod() will override \n" +
+                          "a method of the base class <b><code>p.A</code></b>\n" +
+                          "Renaming method will override final \"method <b><code>A.finalMethod()</code></b>\"", e.getMessage());
       return;
     }
     fail("Conflicts were not found");
diff --git a/platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java
index a22c14f226cd..7471a1657789 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java
@@ -585,7 +585,9 @@ public abstract class BaseRefactoringProcessor implements Runnable {
 
     @Override
     public String getMessage() {
-      return StringUtil.join(messages, "\n");
+      List<String> result = new ArrayList<>(messages);
+      Collections.sort(result);
+      return StringUtil.join(result, "\n");
     }
   }