diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesLoadingTest.kt b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesLoadingTest.kt
index 23e28cd65ed..5ffc618085d 100644
--- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesLoadingTest.kt
+++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/base/AbstractSymbolLightClassesLoadingTest.kt
@@ -6,14 +6,14 @@
 package org.jetbrains.kotlin.light.classes.symbol.base
 
 import com.intellij.openapi.project.Project
+import com.intellij.psi.PsiClass
 import com.intellij.psi.SyntaxTraverser
 import org.jetbrains.kotlin.analysis.test.framework.test.configurators.AnalysisApiTestConfigurator
-import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport
-import org.jetbrains.kotlin.asJava.LightClassTestCommon
+import org.jetbrains.kotlin.asJava.*
 import org.jetbrains.kotlin.asJava.classes.KtLightClass
-import org.jetbrains.kotlin.asJava.renderClass
 import org.jetbrains.kotlin.light.classes.symbol.base.service.withExtendedTypeRenderer
 import org.jetbrains.kotlin.psi.KtClassOrObject
+import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.test.model.TestModule
 import java.nio.file.Path
@@ -35,9 +35,9 @@ abstract class AbstractSymbolLightClassesLoadingTest(
     private fun getLightClassesFromFile(
         ktFile: KtFile,
         project: Project
-    ): List<KtLightClass> {
+    ): List<PsiClass> {
         val ktClasses = SyntaxTraverser.psiTraverser(ktFile).filter(KtClassOrObject::class.java).toList()
         val kotlinAsJavaSupport = KotlinAsJavaSupport.getInstance(project)
-        return ktClasses.mapNotNull(kotlinAsJavaSupport::getLightClass)
+        return ktClasses.mapNotNull(kotlinAsJavaSupport::getLightClass) + listOfNotNull(kotlinAsJavaSupport.getLightFacade(ktFile))
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.java
index 0d3618f96ce..c805751c67e 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/LateinitProperties.java
@@ -88,3 +88,13 @@ public final class Custom /* Custom*/ {
   public  Custom();//  .ctor()
 
 }
+
+public final class LateinitPropertiesKt /* LateinitPropertiesKt*/ {
+  public static Custom topLevelLateinit;
+
+  @org.jetbrains.annotations.NotNull()
+  public static final Custom getTopLevelLateinit();//  getTopLevelLateinit()
+
+  public static final void setTopLevelLateinit(@org.jetbrains.annotations.NotNull() Custom);//  setTopLevelLateinit(Custom)
+
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAliases.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAliases.java
index 29c78dc652f..10e3106de40 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAliases.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAliases.java
@@ -13,4 +13,7 @@ public final class O /* O*/ {
 
   private  O();//  .ctor()
 
-}
\ No newline at end of file
+}
+
+public final class TypeAliasesKt /* TypeAliasesKt*/ {
+}
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAliases.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAliases.lib.java
index ff225862b52..08acd68fed1 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAliases.lib.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/typeAliases.lib.java
@@ -1 +1,2 @@
-// NOT_GENERATED
\ No newline at end of file
+public final class TypeAliasesKt /* TypeAliasesKt*/ {
+}