diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java
index 3e527eadfe8..47103158ce6 100644
--- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java
+++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java
@@ -821,6 +821,18 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta
             doTest(fileName);
         }
 
+        @TestMetadata("publicPropertyWithPrivateSetter")
+        public void testPublicPropertyWithPrivateSetter() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("publicPropertyWithPrivateSetterMultiFileFacade")
+        public void testPublicPropertyWithPrivateSetterMultiFileFacade() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/");
+            doTest(fileName);
+        }
+
         @TestMetadata("removeAndRestoreCompanion")
         public void testRemoveAndRestoreCompanion() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/");
diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
index 47451ca06ab..27ef2946781 100644
--- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
+++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
@@ -821,6 +821,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
             doTest(fileName);
         }
 
+        @TestMetadata("publicPropertyWithPrivateSetter")
+        public void testPublicPropertyWithPrivateSetter() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/");
+            doTest(fileName);
+        }
+
+        @TestMetadata("publicPropertyWithPrivateSetterMultiFileFacade")
+        public void testPublicPropertyWithPrivateSetterMultiFileFacade() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/");
+            doTest(fileName);
+        }
+
         @TestMetadata("removeAndRestoreCompanion")
         public void testRemoveAndRestoreCompanion() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/");
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/build.log
new file mode 100644
index 00000000000..157ba41596f
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/build.log
@@ -0,0 +1,11 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/test2/Prop2Kt.class
+End of files
+Compiling files:
+  src/prop2.kt
+End of files
+Exit code: OK
+------------------------------------------
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop1.kt
new file mode 100644
index 00000000000..046382d5cc4
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop1.kt
@@ -0,0 +1,4 @@
+package test
+
+var property = 1
+    private set
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt
new file mode 100644
index 00000000000..5378c878b13
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt
@@ -0,0 +1,6 @@
+package test2
+import test.*
+
+fun dummy() {
+    if (true) 1 else property
+}
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt.new
new file mode 100644
index 00000000000..7060f03a59b
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt.new
@@ -0,0 +1,5 @@
+package test
+
+fun dummy() {
+    if (true) 2 else property
+}
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/build.log
new file mode 100644
index 00000000000..157ba41596f
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/build.log
@@ -0,0 +1,11 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/test2/Prop2Kt.class
+End of files
+Compiling files:
+  src/prop2.kt
+End of files
+Exit code: OK
+------------------------------------------
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop1.kt
new file mode 100644
index 00000000000..ebb7a7603e6
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop1.kt
@@ -0,0 +1,6 @@
+@file:JvmName("TTest")
+@file:JvmMultifileClass
+package test
+
+var property = 1
+    private set
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt
new file mode 100644
index 00000000000..5378c878b13
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt
@@ -0,0 +1,6 @@
+package test2
+import test.*
+
+fun dummy() {
+    if (true) 1 else property
+}
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt.new
new file mode 100644
index 00000000000..7060f03a59b
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt.new
@@ -0,0 +1,5 @@
+package test
+
+fun dummy() {
+    if (true) 2 else property
+}