diff --git a/java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java b/java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java
index 501124bd2421..14f9179cc6c9 100644
--- a/java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java
+++ b/java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java
@@ -540,7 +540,7 @@ public final class PsiTypesUtil {
           if (type instanceof PsiClassType) {
             PsiClass aClass = ((PsiClassType)type).resolveGenerics().getElement();
             if (aClass instanceof PsiTypeParameter || 
-                aClass != null && PsiUtil.typeParametersIterator(aClass).hasNext()) {
+                aClass != null && PsiUtil.typeParametersIterator(aClass).hasNext() && !((PsiClassType)type).isRaw()) {
               return true;
             }
           }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/NoUncheckedWarningOnRawSubstitutor.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/NoUncheckedWarningOnRawSubstitutor.java
index c0ad531f7b4b..816868f7593e 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/NoUncheckedWarningOnRawSubstitutor.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/NoUncheckedWarningOnRawSubstitutor.java
@@ -24,3 +24,11 @@ class Bar2 {
     return null;
   }
 }
+
+class Bar3<<warning descr="Type parameter 'K' is never used">K</warning>> {
+  class Foo<<warning descr="Type parameter 'T' is never used">T</warning>> {}
+  void m(Foo <warning descr="Parameter 'rawFoo' is never used">rawFoo</warning>) {}
+  void n(Bar3 b, Foo rawFoo) {
+    b.m(rawFoo);
+  }
+}
\ No newline at end of file