diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/name/propertyAndMethodInImplementor.kt b/compiler/testData/diagnostics/testsWithJsStdLib/name/propertyAndMethodInImplementor.kt
new file mode 100644
index 00000000000..2c65608fb7b
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/name/propertyAndMethodInImplementor.kt
@@ -0,0 +1,9 @@
+package foo
+
+interface I {
+    <!JS_NAME_CLASH!>fun foo()<!> = 23
+}
+
+class Sub : I {
+    <!JS_NAME_CLASH!>var foo<!> = 42
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/name/propertyAndMethodInImplementor.txt b/compiler/testData/diagnostics/testsWithJsStdLib/name/propertyAndMethodInImplementor.txt
new file mode 100644
index 00000000000..67e7534889a
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/name/propertyAndMethodInImplementor.txt
@@ -0,0 +1,20 @@
+package
+
+package foo {
+
+    public interface I {
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open fun foo(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+
+    public final class Sub : foo.I {
+        public constructor Sub()
+        public final var foo: kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun foo(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJsStdLibGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJsStdLibGenerated.java
index 715b44ac6a7..4722f754a7c 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJsStdLibGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJsStdLibGenerated.java
@@ -415,6 +415,12 @@ public class DiagnosticsTestWithJsStdLibGenerated extends AbstractDiagnosticsTes
             doTest(fileName);
         }
 
+        @TestMetadata("propertyAndMethodInImplementor.kt")
+        public void testPropertyAndMethodInImplementor() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/name/propertyAndMethodInImplementor.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("propertyAndMethodInSubclass.kt")
         public void testPropertyAndMethodInSubclass() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/name/propertyAndMethodInSubclass.kt");