diff --git a/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java b/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java
index cec083fbb7fd..2f7d631b7632 100644
--- a/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java
+++ b/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java
@@ -1389,7 +1389,7 @@ public class StructuralSearchTest extends StructuralSearchTestCase {
       findMatchesCount(s81_5, "HashMap<String, Integer>")
     );
 
-    String source1 = "class Comparator<T> { private Comparator<String> c; private Comparator d; }";
+    String source1 = "class Comparator<T> { private Comparator<String> c; private Comparator d; private Comparator e; }";
     String target1 = "java.util.Comparator 'a;";
     assertEquals(
       "qualified type should not match 1",
@@ -1404,6 +1404,24 @@ public class StructuralSearchTest extends StructuralSearchTestCase {
       findMatchesCount(source1, target2)
     );
 
+    assertEquals(
+      "unparameterized type query should match",
+      3,
+      findMatchesCount(source1, "Comparator 'a;")
+    );
+
+    assertEquals(
+      "parameterized type query should only match parameterized",
+      1,
+      findMatchesCount(source1, "Comparator<'_a> 'b;")
+    );
+
+    assertEquals(
+      "should find unparameterized only",
+      2,
+      findMatchesCount(source1, "Comparator<'_a{0,0}> 'b;")
+    );
+
     String source2 = "class A<@Q T> {}\n" +
                      "class B<T> {}";
     assertEquals(