diff --git a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/conflicts.txt b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/conflicts.txt
index 5671f7051d3..a2383711c84 100644
--- a/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/conflicts.txt
+++ b/idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/conflicts.txt
@@ -1,5 +1,3 @@
 Class A.X is private and will not be accessible from file noImports.kt.
-Class A.X is private and will not be accessible from file noImports.kt.
-Class A.X is private and will not be accessible from file onDemandImport.kt.
 Class A.X is private and will not be accessible from file onDemandImport.kt.
 Class A.X is private and will not be accessible from file specificImport.kt.
\ No newline at end of file
diff --git a/idea/testData/refactoring/moveMultiModule/moveDirectoryToUnrelatedModuleConflict/conflicts.txt b/idea/testData/refactoring/moveMultiModule/moveDirectoryToUnrelatedModuleConflict/conflicts.txt
index ede2d1a3611..f7f22eafb96 100644
--- a/idea/testData/refactoring/moveMultiModule/moveDirectoryToUnrelatedModuleConflict/conflicts.txt
+++ b/idea/testData/refactoring/moveMultiModule/moveDirectoryToUnrelatedModuleConflict/conflicts.txt
@@ -1,4 +1,3 @@
 Class test2.J, referenced in property test2.pack.Bar.j, will not be accessible in module A
 Class test2.J, referenced in property test2.pack.Foo.j, will not be accessible in module A
-Class test2.pack.Foo, referenced in field J.foo, will not be accessible from module B
 Class test2.pack.Foo, referenced in field J.foo, will not be accessible from module B
\ No newline at end of file
diff --git a/idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/conflicts.txt b/idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/conflicts.txt
index bb5400d81f7..d83af2cf9ef 100644
--- a/idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/conflicts.txt
+++ b/idea/testData/refactoring/moveMultiModule/moveFileWithDeclarationsToUnrelatedModuleConflict/conflicts.txt
@@ -1,2 +1 @@
-Property a1.internalTargetVal, referenced in file internalSource.kt, will not be accessible from module A
 Property a1.internalTargetVal, referenced in file internalSource.kt, will not be accessible from module A
\ No newline at end of file
diff --git a/idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/conflicts.txt b/idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/conflicts.txt
index b06de95e0ae..125f1b49fdb 100644
--- a/idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/conflicts.txt
+++ b/idea/testData/refactoring/moveMultiModule/moveInternalToAnotherModule/conflicts.txt
@@ -1,6 +1,5 @@
 Class InternalContent uses function internalFun() which will be inaccessible after move
 Class packA1.InternalContent, referenced in file InternalSource.kt, will not be accessible from module A
-Class packA1.InternalContent, referenced in file InternalSource.kt, will not be accessible from module A
 Class packA2.InternalContentUser, referenced in function packA1.InternalContent.useInternal(), will not be accessible in module B
 Function packA2.InternalContentUser.internalFun(), referenced in function packA1.InternalContent.useInternal(), will not be accessible in module B
 Function useInternal(InternalContent) uses internal function internalFun() which will be inaccessible after move
\ No newline at end of file
diff --git a/idea/testData/refactoring/moveMultiModule/moveMultipleFilesToUnrelatedModuleConflict/conflicts.txt b/idea/testData/refactoring/moveMultiModule/moveMultipleFilesToUnrelatedModuleConflict/conflicts.txt
index 6282fdaf52e..7d2731dc0f6 100644
--- a/idea/testData/refactoring/moveMultiModule/moveMultipleFilesToUnrelatedModuleConflict/conflicts.txt
+++ b/idea/testData/refactoring/moveMultiModule/moveMultipleFilesToUnrelatedModuleConflict/conflicts.txt
@@ -1,6 +1,4 @@
 Class test.Bar, referenced in field J.bar, will not be accessible from module A
-Class test.Bar, referenced in field J.bar, will not be accessible from module A
-Class test.Foo, referenced in field J.foo, will not be accessible from module A
 Class test.Foo, referenced in field J.foo, will not be accessible from module A
 Class test.J, referenced in property test.Bar.j, will not be accessible in module B
 Class test.J, referenced in property test.Foo.j, will not be accessible in module B
\ No newline at end of file
diff --git a/idea/testData/refactoring/moveMultiModule/movePackageToUnrelatedModuleConflict/conflicts.txt b/idea/testData/refactoring/moveMultiModule/movePackageToUnrelatedModuleConflict/conflicts.txt
index c451f5d01c5..f7f22eafb96 100644
--- a/idea/testData/refactoring/moveMultiModule/movePackageToUnrelatedModuleConflict/conflicts.txt
+++ b/idea/testData/refactoring/moveMultiModule/movePackageToUnrelatedModuleConflict/conflicts.txt
@@ -1,6 +1,3 @@
 Class test2.J, referenced in property test2.pack.Bar.j, will not be accessible in module A
 Class test2.J, referenced in property test2.pack.Foo.j, will not be accessible in module A
-Class test2.pack.Foo, referenced in field J.foo, will not be accessible from module B
-Class test2.pack.Foo, referenced in field J.foo, will not be accessible from module B
-Class test2.pack.Foo, referenced in field J.foo, will not be accessible from module B
 Class test2.pack.Foo, referenced in field J.foo, will not be accessible from module B
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractMoveTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractMoveTest.kt
index bbe8f4684d7..b223ebbdf7d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractMoveTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractMoveTest.kt
@@ -138,7 +138,7 @@ fun runMoveRefactoring(path: String, config: JsonObject, rootDir: VirtualFile, p
         assert(!conflictFile.exists())
     }
     catch(e: ConflictsInTestsException) {
-        KotlinTestUtils.assertEqualsToFile(conflictFile, e.messages.sorted().joinToString("\n"))
+        KotlinTestUtils.assertEqualsToFile(conflictFile, e.messages.distinct().sorted().joinToString("\n"))
 
         ConflictsInTestsException.setTestIgnore(true)