diff --git a/idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterface/ImplementJavaInnerInterface.java b/idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterface/ImplementJavaInnerInterface.java
index e19ca2deb08..366aa88a04f 100644
--- a/idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterface/ImplementJavaInnerInterface.java
+++ b/idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterface/ImplementJavaInnerInterface.java
@@ -1,6 +1,6 @@
 public class ImplementJavaInnerInterface {
     interface Test {
-        void foo();
+        void <caret>foo();
     }
 
     void test() {
@@ -12,10 +12,18 @@ public class ImplementJavaInnerInterface {
         };
     }
 
+    public static class OtherJava implements Test {
+        @Override
+        public void foo() {
+
+        }
+    }
+
     void usage(Test test) {
-        test.<caret>foo();
+        test.foo();
     }
 }
 
+// REF: (in ImplementJavaInnerInterface.OtherJava).foo()
 // REF: (in KotlinTest).foo()
 // REF: <anonymous>.foo()
\ No newline at end of file
diff --git a/idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterfaceFromUsage/ImplementJavaInnerInterfaceFromUsage.java b/idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterfaceFromUsage/ImplementJavaInnerInterfaceFromUsage.java
new file mode 100644
index 00000000000..75bc43ee196
--- /dev/null
+++ b/idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterfaceFromUsage/ImplementJavaInnerInterfaceFromUsage.java
@@ -0,0 +1,28 @@
+public class ImplementJavaInnerInterfaceFromUsage {
+    interface Test {
+        void foo();
+    }
+
+    void test() {
+        Test test = new Test() {
+            @Override
+            public void foo() {
+
+            }
+        };
+    }
+
+    public static class OtherJava implements Test {
+        @Override
+        public void foo() {
+
+        }
+    }
+
+    void usage(Test test) {
+        test.<caret>foo();
+    }
+}
+
+// REF: (in ImplementJavaInnerInterfaceFromUsage.OtherJava).foo()
+// REF: <anonymous>.foo()
\ No newline at end of file
diff --git a/idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterfaceFromUsage/ImplementJavaInnerInterfaceFromUsage.kt b/idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterfaceFromUsage/ImplementJavaInnerInterfaceFromUsage.kt
new file mode 100644
index 00000000000..fb882f3e629
--- /dev/null
+++ b/idea/testData/navigation/implementations/multifile/ImplementJavaInnerInterfaceFromUsage/ImplementJavaInnerInterfaceFromUsage.kt
@@ -0,0 +1,3 @@
+class KotlinTest : ImplementJavaInnerInterfaceFromUsage.Test {
+    override fun foo() {}
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationMultifileTest.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationMultifileTest.java
index c874b7a7bce..eec13a97bdd 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationMultifileTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationMultifileTest.java
@@ -66,6 +66,10 @@ public class KotlinGotoImplementationMultifileTest extends KotlinLightCodeInsigh
         doJavaKotlinTest();
     }
 
+    public void testImplementJavaInnerInterfaceFromUsage() throws Exception {
+        doJavaKotlinTest();
+    }
+
     private void doKotlinJavaTest() throws Exception {
         doMultifileTest(getTestName(false) + ".kt", getTestName(false) + ".java");
     }