diff --git a/compiler/testData/asJava/lightClasses/StubOrderForOverloads.java b/compiler/testData/asJava/lightClasses/StubOrderForOverloads.java
new file mode 100644
index 00000000000..0b0197b4edb
--- /dev/null
+++ b/compiler/testData/asJava/lightClasses/StubOrderForOverloads.java
@@ -0,0 +1,7 @@
+public final class A {
+    public final void foo(@org.jetbrains.annotations.Nullable P p1, @org.jetbrains.annotations.Nullable P p2) { /* compiled code */ }
+
+    public final void foo(@org.jetbrains.annotations.NotNull kotlin.jvm.functions.Function4<? super RS,? super P,? super P,? super kotlin.coroutines.experimental.Continuation<? super kotlin.Unit>,? extends java.lang.Object> listener) { /* compiled code */ }
+
+    public A() { /* compiled code */ }
+}
diff --git a/compiler/testData/asJava/lightClasses/StubOrderForOverloads.kt b/compiler/testData/asJava/lightClasses/StubOrderForOverloads.kt
new file mode 100644
index 00000000000..8b830b32651
--- /dev/null
+++ b/compiler/testData/asJava/lightClasses/StubOrderForOverloads.kt
@@ -0,0 +1,8 @@
+// A
+class A {
+    fun foo(p1: P?, p2: P?) {}
+    fun foo(listener: suspend RS.(P?, P?) -> Unit) {}
+}
+
+interface P
+interface RS
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java
index 65aa7c5e94a..d6992108432 100644
--- a/compiler/tests/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java
@@ -144,6 +144,12 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT
         doTest(fileName);
     }
 
+    @TestMetadata("StubOrderForOverloads.kt")
+    public void testStubOrderForOverloads() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/StubOrderForOverloads.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("VarArgs.kt")
     public void testVarArgs() throws Exception {
         String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/VarArgs.kt");
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeCompiledLightClassTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeCompiledLightClassTestGenerated.java
index 2ef24284324..fc0d2b63c2d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeCompiledLightClassTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeCompiledLightClassTestGenerated.java
@@ -144,6 +144,12 @@ public class IdeCompiledLightClassTestGenerated extends AbstractIdeCompiledLight
         doTest(fileName);
     }
 
+    @TestMetadata("StubOrderForOverloads.kt")
+    public void testStubOrderForOverloads() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/StubOrderForOverloads.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("VarArgs.kt")
     public void testVarArgs() throws Exception {
         String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/VarArgs.kt");
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeLightClassTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeLightClassTestGenerated.java
index 99dd5ead8cc..f3ccf19ce7f 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeLightClassTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeLightClassTestGenerated.java
@@ -144,6 +144,12 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest {
         doTest(fileName);
     }
 
+    @TestMetadata("StubOrderForOverloads.kt")
+    public void testStubOrderForOverloads() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/StubOrderForOverloads.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("VarArgs.kt")
     public void testVarArgs() throws Exception {
         String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/VarArgs.kt");