diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA139214.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA139214.java
new file mode 100644
index 000000000000..8e810017cb57
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA139214.java
@@ -0,0 +1,15 @@
+class JavaClass {
+  interface I1<T> {
+    void id(T x);
+  }
+
+  static class C1<T> {
+    void id(T x) {
+    }
+  }
+
+  <error descr="'id(T)' in 'JavaClass.I1' clashes with 'id(T)' in 'JavaClass.C1'; both methods have same erasure, yet neither overrides the other">static class C2 extends C1<String> implements I1<Integer></error> {
+    public void id(Integer x) {
+    }
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/GenericsHighlightingTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/GenericsHighlightingTest.java
index f04e4136ae92..8bb1aadba881 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/GenericsHighlightingTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/GenericsHighlightingTest.java
@@ -433,4 +433,5 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase {
   public void testInheritFromDifferentParameterizations() { doTest6(false); }
   public void testCheckAccessibilityBeforeSuperFieldReferenceInSuperCall() { doTest6(false); }
   public void testIDEA128159() { doTest6(false); }
+  public void testIDEA139214() { doTest(LanguageLevel.JDK_1_6, JavaSdkVersion.JDK_1_8, false); }
 }
\ No newline at end of file