diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClass.2.kt b/idea/testData/findUsages/kotlin/conventions/components/dataClass.2.kt
index 446eaa5c8f7..ae28481cb7c 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/dataClass.2.kt
+++ b/idea/testData/findUsages/kotlin/conventions/components/dataClass.2.kt
@@ -20,15 +20,3 @@ fun g() = A()
 fun h() = g()
 
 fun listOfA() = listOf<A>(A(1, "", ""))
-
-fun x(o: Any) {
-    if (o is A) {
-        val (x, y) = o
-        val (x1, y1) = A(1, "", "")
-    }
-}
-
-fun y(o: Any) {
-    val list = o as List<A>
-    val (x, y) = list[0]
-}
diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClass.log b/idea/testData/findUsages/kotlin/conventions/components/dataClass.log
index 6efee9cbddb..e880bd3b6d4 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/dataClass.log
+++ b/idea/testData/findUsages/kotlin/conventions/components/dataClass.log
@@ -4,12 +4,10 @@ Searched references to a in Kotlin files
 Searched references to f() in Kotlin files
 Searched references to g() in Kotlin files
 Searched references to h() in Kotlin files
-Searched references to list in Kotlin files
 Searched references to listOfA() in Kotlin files
 Searched references to pack.A
 Searched references to parameter a in null in Kotlin files
 Used plain search in LocalSearchScope:
     CLASS:A
     FUN:ext1
-    FUN:ext1
-    FUN:x
\ No newline at end of file
+    FUN:ext1
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClass.results.txt b/idea/testData/findUsages/kotlin/conventions/components/dataClass.results.txt
index f320f83e607..4e0b89fca51 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/dataClass.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/components/dataClass.results.txt
@@ -7,9 +7,6 @@
 [dataClass.2.kt] Value read 11 val (x3, y3, z3) = h()
 [dataClass.2.kt] Value read 13 val (x4, y4, z4) = listOfA()[0]
 [dataClass.2.kt] Value read 15 val (x5, y5, z5) = javaClass.getA()[0]
-[dataClass.2.kt] Value read 26 val (x, y) = o
-[dataClass.2.kt] Value read 27 val (x1, y1) = A(1, "", "")
-[dataClass.2.kt] Value read 33 val (x, y) = list[0]
 [dataClass.2.kt] Value read 5 a.n
 [dataClass.2.kt] Value read 8 val (x, y, z) = a
 [dataClass.2.kt] Value read 9 val (x1, y1, z1) = f()
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/components/isAndAs.0.kt b/idea/testData/findUsages/kotlin/conventions/components/isAndAs.0.kt
new file mode 100644
index 00000000000..bdf9e4970e7
--- /dev/null
+++ b/idea/testData/findUsages/kotlin/conventions/components/isAndAs.0.kt
@@ -0,0 +1,16 @@
+// PSI_ELEMENT: org.jetbrains.kotlin.psi.KtParameter
+// OPTIONS: usages
+
+data class A(val <caret>x: Int, val y: Int)
+
+fun x(o: Any) {
+    if (o is A) {
+        val (x, y) = o
+        val (x1, y1) = A(1, "", "")
+    }
+}
+
+fun y(o: Any) {
+    val list = o as List<A>
+    val (x, y) = list[0]
+}
diff --git a/idea/testData/findUsages/kotlin/conventions/components/isAndAs.log b/idea/testData/findUsages/kotlin/conventions/components/isAndAs.log
new file mode 100644
index 00000000000..3d96ce4e4db
--- /dev/null
+++ b/idea/testData/findUsages/kotlin/conventions/components/isAndAs.log
@@ -0,0 +1,6 @@
+Searched inheritors of A
+Searched references to A
+Searched references to list in Kotlin files
+Used plain search in LocalSearchScope:
+    CLASS:A
+    FUN:x
diff --git a/idea/testData/findUsages/kotlin/conventions/components/isAndAs.results.txt b/idea/testData/findUsages/kotlin/conventions/components/isAndAs.results.txt
new file mode 100644
index 00000000000..24471fd146e
--- /dev/null
+++ b/idea/testData/findUsages/kotlin/conventions/components/isAndAs.results.txt
@@ -0,0 +1,3 @@
+Value read 15 val (x, y) = list[0]
+Value read 8 val (x, y) = o
+Value read 9 val (x1, y1) = A(1, "", "")
diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java b/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java
index 9143d2ee28f..49b24789a21 100644
--- a/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java
@@ -212,6 +212,12 @@ public class FindUsagesTestGenerated extends AbstractFindUsagesTest {
                     doTest(fileName);
                 }
 
+                @TestMetadata("isAndAs.0.kt")
+                public void testIsAndAs() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/components/isAndAs.0.kt");
+                    doTest(fileName);
+                }
+
                 @TestMetadata("lambdas.0.kt")
                 public void testLambdas() throws Exception {
                     String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/components/lambdas.0.kt");