diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java
index 14a446a908cc..49e63494a1d3 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java
@@ -478,7 +478,7 @@ public class InferenceSession {
           if (eqBounds.size() > 1) {
             for (Iterator<PsiType> iterator = eqBounds.iterator(); iterator.hasNext(); ) {
               PsiType eqBound = acceptBoundsWithRecursiveDependencies(inferenceVariable, iterator.next(), substitutor);
-              if (PsiUtil.resolveClassInType(eqBound) == typeParameter || Comparing.equal(bound, eqBound)) {
+              if (PsiUtil.resolveClassInType(eqBound) == typeParameter || !(bound instanceof PsiCapturedWildcardType) && Comparing.equal(bound, eqBound)) {
                 iterator.remove();
               } else if (bound == null) {
                 bound = eqBound; 
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEA94011.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEA94011.java
index 6d5cdfa2af0b..cf11bfd194fb 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEA94011.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/IDEA94011.java
@@ -10,7 +10,7 @@ class Test {
 
     public void test(Set<MyConsumer> set) {
         @SuppressWarnings("unchecked")
-        Map<Parent, MyConsumer<Parent>> map = create<error descr="'create(java.util.Set<T>)' in 'Test' cannot be applied to '(java.util.Set<Test.MyConsumer>)'">(set)</error>;
+        Map<Parent, MyConsumer<Parent>> map = <error descr="Inferred type 'T' for type parameter 'T' is not within its bound; should implement 'Test.Consumer<Test.Parent>'">create(set)</error>;
 
     }
 
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GenericsHighlighting8Test.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GenericsHighlighting8Test.java
index 2058f029de8a..a47977db6e89 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GenericsHighlighting8Test.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GenericsHighlighting8Test.java
@@ -71,7 +71,7 @@ public class GenericsHighlighting8Test extends LightDaemonAnalyzerTestCase {
   public void testInferenceWithBounds() {
     doTest();
   }
-  public void _testInferenceWithSuperBounds() {
+  public void testInferenceWithSuperBounds() {
     doTest();
   }
   public void testInferenceWithUpperBoundPromotion() {
@@ -86,7 +86,7 @@ public class GenericsHighlighting8Test extends LightDaemonAnalyzerTestCase {
   public void testRawOverridingMethods() {
     doTest();
   }    
-  public void _testAutoboxing() { //todo
+  public void testAutoboxing() {
     doTest();
   }                
   public void testAutoboxingMethods() {
@@ -98,7 +98,7 @@ public class GenericsHighlighting8Test extends LightDaemonAnalyzerTestCase {
   public void testEnumWithAbstractMethods() {
     doTest();
   }                                   
-  public void _testEnum() { doTest(); } //todo     
+  public void testEnum() { doTest(); }
   public void testEnum56239() {
     doTest();
   }
@@ -264,7 +264,7 @@ public class GenericsHighlighting8Test extends LightDaemonAnalyzerTestCase {
   public void testIDEA57339() {
     doTest();
   } 
-  public void _testIDEA57340() {
+  public void testIDEA57340() {
     doTest();
   }
   public void testIDEA89771() {
@@ -297,7 +297,7 @@ public class GenericsHighlighting8Test extends LightDaemonAnalyzerTestCase {
   public void testIDEA57563() {
     doTest();
   }
-  public void _testIDEA57275() {
+  public void testIDEA57275() {
     doTest();
   }
   public void testIDEA57533() {
@@ -315,7 +315,7 @@ public class GenericsHighlighting8Test extends LightDaemonAnalyzerTestCase {
   public void testIDEA57484() {
     doTest();
   }
-  public void _testIDEA57485() {//todo
+  public void testIDEA57485() {
     doTest();
   }
   public void testIDEA57486() {
@@ -400,7 +400,7 @@ public class GenericsHighlighting8Test extends LightDaemonAnalyzerTestCase {
     doTest();
   }
 
-  public void _testIDEA94011() {
+  public void testIDEA94011() {
     doTest();
   }
   public void testDifferentTypeParamsInOverloadedMethods() {
@@ -619,7 +619,7 @@ public class GenericsHighlighting8Test extends LightDaemonAnalyzerTestCase {
   public void testIDEA67571(){
     doTest();
   }
-  public void _testTypeArgumentsOnRawType(){//todo
+  public void testTypeArgumentsOnRawType(){
     doTest();
   }
 
@@ -758,7 +758,7 @@ public class GenericsHighlighting8Test extends LightDaemonAnalyzerTestCase {
     doTest();
   }
 
-  public void _testJavaUtilCollections_NoVerify() throws Exception {   //todo
+  public void testJavaUtilCollections_NoVerify() throws Exception {
     PsiClass collectionsClass = getJavaFacade().findClass("java.util.Collections", GlobalSearchScope.moduleWithLibrariesScope(getModule()));
     assertNotNull(collectionsClass);
     collectionsClass = (PsiClass)collectionsClass.getNavigationElement();