diff --git a/compiler/testData/diagnostics/tests/override/kt880.kt b/compiler/testData/diagnostics/tests/override/kt880.kt
new file mode 100644
index 00000000000..a8dad78b8d4
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/override/kt880.kt
@@ -0,0 +1,16 @@
+// KT-880 Overload resolution ambiguity
+
+public trait I {
+    open fun test() : Unit
+}
+
+abstract public class A() {
+    open public fun test() : Unit {
+    }
+}
+
+public open class T() : A(), I {
+    open fun main() : Unit {
+        test() // Test no "Overload resolution ambiguity" is here
+    }
+}
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
index a70bf131ed0..3842d6bb238 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
@@ -3217,6 +3217,11 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
                 doTest("compiler/testData/diagnostics/tests/override/kt1862.kt");
             }
             
+            @TestMetadata("kt880.kt")
+            public void testKt880() throws Exception {
+                doTest("compiler/testData/diagnostics/tests/override/kt880.kt");
+            }
+            
             @TestMetadata("MultipleDefaultParametersInSupertypes.kt")
             public void testMultipleDefaultParametersInSupertypes() throws Exception {
                 doTest("compiler/testData/diagnostics/tests/override/MultipleDefaultParametersInSupertypes.kt");