diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/extensionPropertyUsages.0.kt b/idea/testData/findUsages/kotlin/findPropertyUsages/extensionPropertyUsages.0.kt
new file mode 100644
index 00000000000..331d890f82d
--- /dev/null
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/extensionPropertyUsages.0.kt
@@ -0,0 +1,5 @@
+// PSI_ELEMENT: org.jetbrains.kotlin.psi.KtProperty
+// OPTIONS: usages
+@file:JvmName("AKt")
+
+val String.<caret>x: Int get() = 1
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/extensionPropertyUsages.1.java b/idea/testData/findUsages/kotlin/findPropertyUsages/extensionPropertyUsages.1.java
new file mode 100644
index 00000000000..258ffd3c404
--- /dev/null
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/extensionPropertyUsages.1.java
@@ -0,0 +1,5 @@
+public class JavaClass {
+    public static void main() {
+        AKt.getX("");
+    }
+}
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/extensionPropertyUsages.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/extensionPropertyUsages.results.txt
new file mode 100644
index 00000000000..6273835b90e
--- /dev/null
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/extensionPropertyUsages.results.txt
@@ -0,0 +1 @@
+Unclassified usage 3 AKt.getX("");
diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java b/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java
index 4148c226f46..54e3ebf4477 100644
--- a/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java
@@ -876,6 +876,12 @@ public class FindUsagesTestGenerated extends AbstractFindUsagesTest {
                 KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findPropertyUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
             }
 
+            @TestMetadata("extensionPropertyUsages.0.kt")
+            public void testExtensionPropertyUsages() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/extensionPropertyUsages.0.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("javaAndKotlinOverrides.0.kt")
             public void testJavaAndKotlinOverrides() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.0.kt");