diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/SameName.java b/compiler/testData/asJava/lightClasses/compilationErrors/SameName.java
new file mode 100644
index 00000000000..12436ad2667
--- /dev/null
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/SameName.java
@@ -0,0 +1,17 @@
+public final class A {
+    private final int i = 0;
+    private final java.lang.String i$1 = "";
+    private final java.lang.String j = "a";
+    private final java.lang.String j$1 = "b";
+
+    public final void f(int i, double s) { /* compiled code */ }
+
+    public final void f(int i, double s) { /* compiled code */ }
+
+    public final int g(int i, double s) { /* compiled code */ }
+
+    @org.jetbrains.annotations.NotNull
+    public final java.lang.String g(int s, double i) { /* compiled code */ }
+
+    public A() { /* compiled code */ }
+}
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/SameName.kt b/compiler/testData/asJava/lightClasses/compilationErrors/SameName.kt
new file mode 100644
index 00000000000..921a4ba8d51
--- /dev/null
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/SameName.kt
@@ -0,0 +1,15 @@
+// A
+class A {
+    fun f(i: Int, s: Double) {}
+    fun f(i: Int, s: Double) {}
+
+
+    fun g(i: Int, s: Double): Int {}
+    fun g(s: Int, i: Double): String {}
+
+    private val i: Int = 0
+    private val i: String = ""
+
+    private val j: String = "a"
+    private val j: String = "b"
+}
diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java
index 7a3f3497e49..596a589c276 100644
--- a/compiler/tests/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java
@@ -80,6 +80,12 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/compilationErrors"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
+        @TestMetadata("SameName.kt")
+        public void testSameName() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/SameName.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("TopLevelDestructuring.kt")
         public void testTopLevelDestructuring() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/TopLevelDestructuring.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 a64fe0dbfc0..ea2e2083160 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeLightClassTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeLightClassTestGenerated.java
@@ -80,6 +80,12 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/compilationErrors"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
+        @TestMetadata("SameName.kt")
+        public void testSameName() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/SameName.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("TopLevelDestructuring.kt")
         public void testTopLevelDestructuring() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/compilationErrors/TopLevelDestructuring.kt");