diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClass.2.kt b/idea/testData/findUsages/kotlin/conventions/components/dataClass.2.kt
index a567bbab441..446eaa5c8f7 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/dataClass.2.kt
+++ b/idea/testData/findUsages/kotlin/conventions/components/dataClass.2.kt
@@ -32,25 +32,3 @@ fun y(o: Any) {
     val list = o as List<A>
     val (x, y) = list[0]
 }
-
-fun when1(o: Any) {
-    when (o) {
-        is A -> {
-            val (x, y) = o
-        }
-
-        is String -> TODO()
-
-        else -> return
-    }
-}
-
-fun when2(o: Any) {
-    when (o) {
-        !is A -> { }
-
-        else -> {
-            val (x, y) = o
-        }
-    }
-}
diff --git a/idea/testData/findUsages/kotlin/conventions/components/dataClass.log b/idea/testData/findUsages/kotlin/conventions/components/dataClass.log
index 8dd62238ccb..6efee9cbddb 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/dataClass.log
+++ b/idea/testData/findUsages/kotlin/conventions/components/dataClass.log
@@ -12,6 +12,4 @@ Used plain search in LocalSearchScope:
     CLASS:A
     FUN:ext1
     FUN:ext1
-    FUN:x
-    KtWhenEntry "else"
-    KtWhenEntry "is A"
\ No newline at end of file
+    FUN:x
\ 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 25bb434ee10..f320f83e607 100644
--- a/idea/testData/findUsages/kotlin/conventions/components/dataClass.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/components/dataClass.results.txt
@@ -10,8 +10,6 @@
 [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 39 val (x, y) = o
 [dataClass.2.kt] Value read 5 a.n
-[dataClass.2.kt] Value read 53 val (x, y) = o
 [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/when.0.kt b/idea/testData/findUsages/kotlin/conventions/components/when.0.kt
new file mode 100644
index 00000000000..e823e58db0f
--- /dev/null
+++ b/idea/testData/findUsages/kotlin/conventions/components/when.0.kt
@@ -0,0 +1,26 @@
+// PSI_ELEMENT: org.jetbrains.kotlin.psi.KtParameter
+// OPTIONS: usages
+
+data class A(val <caret>a: Int, val b: Int)
+
+fun when1(o: Any) {
+    when (o) {
+        is A -> {
+            val (x, y) = o
+        }
+
+        is String -> TODO()
+
+        else -> return
+    }
+}
+
+fun when2(o: Any) {
+    when (o) {
+        !is A -> { }
+
+        else -> {
+            val (x, y) = o
+        }
+    }
+}
diff --git a/idea/testData/findUsages/kotlin/conventions/components/when.log b/idea/testData/findUsages/kotlin/conventions/components/when.log
new file mode 100644
index 00000000000..3ee2e387705
--- /dev/null
+++ b/idea/testData/findUsages/kotlin/conventions/components/when.log
@@ -0,0 +1,6 @@
+Searched inheritors of A
+Searched references to A
+Used plain search in LocalSearchScope:
+    CLASS:A
+    KtWhenEntry "else"
+    KtWhenEntry "is A"
diff --git a/idea/testData/findUsages/kotlin/conventions/components/when.results.txt b/idea/testData/findUsages/kotlin/conventions/components/when.results.txt
new file mode 100644
index 00000000000..4b9f6c2920b
--- /dev/null
+++ b/idea/testData/findUsages/kotlin/conventions/components/when.results.txt
@@ -0,0 +1,2 @@
+Value read 23 val (x, y) = o
+Value read 9 val (x, y) = o
diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java b/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java
index 7a44a56de0d..9143d2ee28f 100644
--- a/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java
@@ -229,6 +229,12 @@ public class FindUsagesTestGenerated extends AbstractFindUsagesTest {
                     String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/components/SAM.0.kt");
                     doTest(fileName);
                 }
+
+                @TestMetadata("when.0.kt")
+                public void testWhen() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/components/when.0.kt");
+                    doTest(fileName);
+                }
             }
         }