diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA150499.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA150499.java
new file mode 100644
index 000000000000..03e4d609367a
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA150499.java
@@ -0,0 +1,23 @@
+interface Root {
+  Worker<? extends Root> foo();
+}
+
+interface Worker<T extends Root> {
+}
+
+interface SubRootA extends Root {
+  @Override
+  Worker<? extends SubRootA> foo();
+}
+
+interface SubRootB extends Root {
+  @Override
+  Worker<? extends SubRootB> foo();
+}
+
+interface Joined extends Root, SubRootA, SubRootB {
+  @Override
+  Worker<? extends Joined> foo();
+}
+
+interface Erroneously extends Joined {}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java
index b8944b7ded5a..7dc57259de9e 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java
@@ -563,6 +563,10 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase {
     doTest(LanguageLevel.JDK_1_7, JavaSdkVersion.JDK_1_7, false);
   }
 
+  public void testIDEA150499() throws Exception {
+    doTest(LanguageLevel.JDK_1_7, JavaSdkVersion.JDK_1_7, false);
+  }
+
   public void testLeastUpperBoundWithRecursiveTypes() throws Exception {
     final PsiManager manager = getPsiManager();
     final GlobalSearchScope scope = GlobalSearchScope.allScope(getProject());