diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java
index 2ee8fd46724..ab67536190b 100644
--- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java
@@ -335,6 +335,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta
             doTest(fileName);
         }
 
+        @TestMetadata("funVsConstructorOverloadConflict")
+        public void testFunVsConstructorOverloadConflict() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/");
+            doTest(fileName);
+        }
+
         @TestMetadata("functionBecameInline")
         public void testFunctionBecameInline() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/functionBecameInline/");
diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
index 49b4ef012aa..0d2f97b7183 100644
--- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
@@ -335,6 +335,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
             doTest(fileName);
         }
 
+        @TestMetadata("funVsConstructorOverloadConflict")
+        public void testFunVsConstructorOverloadConflict() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/");
+            doTest(fileName);
+        }
+
         @TestMetadata("functionBecameInline")
         public void testFunctionBecameInline() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/functionBecameInline/");
diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log
index f9971a4960e..7122f36b6d3 100644
--- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log
+++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log
@@ -4,9 +4,19 @@ End of files
 Compiling files:
 src/A.kt
 End of files
+COMPILATION FAILED
+'public constructor A(x: kotlin.String)' conflicts with another declaration: public constructor A(x: kotlin.String)
+
+
+Cleaning output files:
+out/production/module/AConstructorFunctionKt.class
+out/production/module/META-INF/module.kotlin_module
+End of files
+Compiling files:
+src/A.kt
+End of files
 Cleaning output files:
 out/production/module/AChild.class
-out/production/module/AConstructorFunctionKt.class
 out/production/module/CreateAFromIntKt.class
 out/production/module/CreateAFromStringKt.class
 out/production/module/META-INF/module.kotlin_module
@@ -14,23 +24,6 @@ out/production/module/UseAKt.class
 End of files
 Compiling files:
 src/AChild.kt
-src/AConstructorFunction.kt
-src/createAFromInt.kt
-src/createAFromString.kt
-src/useA.kt
-End of files
-COMPILATION FAILED
-Overload resolution ambiguity: 
-public constructor A(x: kotlin.String) defined in A
-public fun A(x: kotlin.String): A defined in root package
-
-
-Cleaning output files:
-out/production/module/A.class
-End of files
-Compiling files:
-src/A.kt
-src/AChild.kt
 src/createAFromInt.kt
 src/createAFromString.kt
 src/useA.kt
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log
index 1e5f3f89482..1224d634ee4 100644
--- a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log
@@ -6,4 +6,4 @@ Compiling files:
 src/fun2.kt
 End of files
 COMPILATION FAILED
-'public fun function(): kotlin.Unit' is already defined in test
\ No newline at end of file
+'public fun function(): kotlin.Unit' conflicts with another declaration: public fun function(): kotlin.Unit
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log
new file mode 100644
index 00000000000..e3d39a6b779
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log
@@ -0,0 +1,9 @@
+Cleaning output files:
+out/production/module/META-INF/module.kotlin_module
+out/production/module/test/Fun2Kt.class
+End of files
+Compiling files:
+src/fun2.kt
+End of files
+COMPILATION FAILED
+'public constructor function()' conflicts with another declaration: public constructor function()
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun1.kt
new file mode 100644
index 00000000000..539d6344c39
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun1.kt
@@ -0,0 +1,5 @@
+package test
+
+fun function() {
+
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt
new file mode 100644
index 00000000000..897d69e3641
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt
@@ -0,0 +1,3 @@
+package test
+
+val x = 1
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt.new
new file mode 100644
index 00000000000..bf81e8e2e1d
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt.new
@@ -0,0 +1,5 @@
+package test
+
+val x = 1
+
+class function
\ No newline at end of file