diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1358.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt1358.kt
new file mode 100644
index 00000000000..395bf4371ae
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1358.kt
@@ -0,0 +1,11 @@
+//KT-1358 Overload resolution ambiguity with autocast and generic function
+package d
+
+fun bar(a: Any?) {
+    if (a != null) {
+        a.foo() //overload resolution ambiguity
+        a.sure() //overload resolution ambiguity
+    }
+}
+
+fun <T : Any> T?.foo() {}
\ 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 d9a686b00b0..e280fc018f4 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
@@ -1375,6 +1375,11 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage
                     doTest("compiler/testData/diagnostics/tests/inference/regressions/kt1145.kt");
                 }
                 
+                @TestMetadata("kt1358.kt")
+                public void testKt1358() throws Exception {
+                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt1358.kt");
+                }
+                
                 @TestMetadata("kt1410.kt")
                 public void testKt1410() throws Exception {
                     doTest("compiler/testData/diagnostics/tests/inference/regressions/kt1410.kt");