diff --git a/compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.java b/compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.java
new file mode 100644
index 00000000000..d18dedd19ce
--- /dev/null
+++ b/compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.java
@@ -0,0 +1,3 @@
+public final class NewName {
+    public static final void foo() { /* compiled code */ }
+}
diff --git a/compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt b/compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt
new file mode 100644
index 00000000000..b7a633dd244
--- /dev/null
+++ b/compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt
@@ -0,0 +1,6 @@
+//NewName
+@file:JvmName("NewName")
+
+fun foo() {
+
+}
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTestGenerated.java
index e9fbe160e28..bc87ae27d1b 100644
--- a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTestGenerated.java
@@ -75,6 +75,12 @@ public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest
             String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/SingleFile.kt");
             doTest(fileName);
         }
+
+        @TestMetadata("SingleJvmClassName.kt")
+        public void testSingleJvmClassName() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt");
+            doTest(fileName);
+        }
     }
 
     @TestMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations")
diff --git a/idea/idea-completion/testData/injava/RenamedFacade.java b/idea/idea-completion/testData/injava/RenamedFacade.java
new file mode 100644
index 00000000000..c85433af54d
--- /dev/null
+++ b/idea/idea-completion/testData/injava/RenamedFacade.java
@@ -0,0 +1,9 @@
+public class Testing {
+    void f() {
+        facades.Renamed<caret>
+    }
+}
+
+// EXIST: RenamedNew
+// ABSENT: RenamedFileFacadeKt
+
diff --git a/idea/idea-completion/testData/injava/SingleFileFacade.java b/idea/idea-completion/testData/injava/SingleFileFacade.java
new file mode 100644
index 00000000000..3fa27cae8fd
--- /dev/null
+++ b/idea/idea-completion/testData/injava/SingleFileFacade.java
@@ -0,0 +1,8 @@
+public class Testing {
+    void f() {
+        mockLib.foo.Mai<caret>
+    }
+}
+
+// EXIST: MainKt
+
diff --git a/idea/idea-completion/testData/injava/SingleFileFacadeMembers.java b/idea/idea-completion/testData/injava/SingleFileFacadeMembers.java
new file mode 100644
index 00000000000..04e0713583e
--- /dev/null
+++ b/idea/idea-completion/testData/injava/SingleFileFacadeMembers.java
@@ -0,0 +1,11 @@
+public class Testing {
+    void f() {
+        mockLib.foo.MainKt.<caret>
+    }
+}
+
+// EXIST: topLevelFunction
+// EXIST: topLevelExtFunction
+// EXIST: getTopLevelVar
+// EXIST: setTopLevelVar
+
diff --git a/idea/idea-completion/testData/injava/mockLib/RenamedFileFacade.kt b/idea/idea-completion/testData/injava/mockLib/RenamedFileFacade.kt
new file mode 100644
index 00000000000..450c0bf7d9c
--- /dev/null
+++ b/idea/idea-completion/testData/injava/mockLib/RenamedFileFacade.kt
@@ -0,0 +1,6 @@
+@file:JvmName("RenamedNew")
+package facades
+
+fun foo() {
+
+}
\ No newline at end of file
diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/CompiledKotlinInJavaCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/CompiledKotlinInJavaCompletionTestGenerated.java
index e81a8bbcf2c..850c73ce679 100644
--- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/CompiledKotlinInJavaCompletionTestGenerated.java
+++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/CompiledKotlinInJavaCompletionTestGenerated.java
@@ -107,6 +107,24 @@ public class CompiledKotlinInJavaCompletionTestGenerated extends AbstractCompile
         doTest(fileName);
     }
 
+    @TestMetadata("RenamedFacade.java")
+    public void testRenamedFacade() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/RenamedFacade.java");
+        doTest(fileName);
+    }
+
+    @TestMetadata("SingleFileFacade.java")
+    public void testSingleFileFacade() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacade.java");
+        doTest(fileName);
+    }
+
+    @TestMetadata("SingleFileFacadeMembers.java")
+    public void testSingleFileFacadeMembers() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacadeMembers.java");
+        doTest(fileName);
+    }
+
     @TestMetadata("Subpackage.java")
     public void testSubpackage() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Subpackage.java");
diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinSourceInJavaCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinSourceInJavaCompletionTestGenerated.java
index 6a9b9c51ea8..f4021252d0a 100644
--- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinSourceInJavaCompletionTestGenerated.java
+++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinSourceInJavaCompletionTestGenerated.java
@@ -107,6 +107,24 @@ public class KotlinSourceInJavaCompletionTestGenerated extends AbstractKotlinSou
         doTest(fileName);
     }
 
+    @TestMetadata("RenamedFacade.java")
+    public void testRenamedFacade() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/RenamedFacade.java");
+        doTest(fileName);
+    }
+
+    @TestMetadata("SingleFileFacade.java")
+    public void testSingleFileFacade() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacade.java");
+        doTest(fileName);
+    }
+
+    @TestMetadata("SingleFileFacadeMembers.java")
+    public void testSingleFileFacadeMembers() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacadeMembers.java");
+        doTest(fileName);
+    }
+
     @TestMetadata("Subpackage.java")
     public void testSubpackage() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Subpackage.java");