diff --git a/compiler/testData/codegen/box/properties/lateinit/local/uninitializedCapturedMemberAccess.kt b/compiler/testData/codegen/box/properties/lateinit/local/uninitializedCapturedMemberAccess.kt
index 6b7bbc05359..b96d67b9516 100644
--- a/compiler/testData/codegen/box/properties/lateinit/local/uninitializedCapturedMemberAccess.kt
+++ b/compiler/testData/codegen/box/properties/lateinit/local/uninitializedCapturedMemberAccess.kt
@@ -1,5 +1,5 @@
 // LANGUAGE_VERSION: 1.2
-// WITH_REFLECT
+// WITH_RUNTIME
 // IGNORE_BACKEND: JS, NATIVE
 
 import kotlin.UninitializedPropertyAccessException
@@ -19,6 +19,6 @@ fun box(): String {
         return "OK"
     }
     catch (e: Throwable) {
-        return "Unexpected exception: ${e::class.qualifiedName}"
+        return "Unexpected exception: ${e::class}"
     }
 }
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/properties/lateinit/local/uninitializedCapturedRead.kt b/compiler/testData/codegen/box/properties/lateinit/local/uninitializedCapturedRead.kt
index 17fe9e30fcf..b748853e356 100644
--- a/compiler/testData/codegen/box/properties/lateinit/local/uninitializedCapturedRead.kt
+++ b/compiler/testData/codegen/box/properties/lateinit/local/uninitializedCapturedRead.kt
@@ -1,5 +1,5 @@
 // LANGUAGE_VERSION: 1.2
-// WITH_REFLECT
+// WITH_RUNTIME
 // IGNORE_BACKEND: JS, NATIVE
 
 import kotlin.UninitializedPropertyAccessException
@@ -19,6 +19,6 @@ fun box(): String {
         return "OK"
     }
     catch (e: Throwable) {
-        return "Unexpected exception: ${e::class.qualifiedName}"
+        return "Unexpected exception: ${e::class}"
     }
 }
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/properties/lateinit/local/uninitializedMemberAccess.kt b/compiler/testData/codegen/box/properties/lateinit/local/uninitializedMemberAccess.kt
index 108f00e307d..7b85035c438 100644
--- a/compiler/testData/codegen/box/properties/lateinit/local/uninitializedMemberAccess.kt
+++ b/compiler/testData/codegen/box/properties/lateinit/local/uninitializedMemberAccess.kt
@@ -1,5 +1,5 @@
 // LANGUAGE_VERSION: 1.2
-// WITH_REFLECT
+// WITH_RUNTIME
 // IGNORE_BACKEND: JS, NATIVE
 
 import kotlin.UninitializedPropertyAccessException
@@ -15,6 +15,6 @@ fun box(): String {
         return "OK"
     }
     catch (e: Throwable) {
-        return "Unexpected exception: ${e::class.qualifiedName}"
+        return "Unexpected exception: ${e::class}"
     }
 }
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/properties/lateinit/local/uninitializedRead.kt b/compiler/testData/codegen/box/properties/lateinit/local/uninitializedRead.kt
index 13ec44dd760..c631ba7ad5f 100644
--- a/compiler/testData/codegen/box/properties/lateinit/local/uninitializedRead.kt
+++ b/compiler/testData/codegen/box/properties/lateinit/local/uninitializedRead.kt
@@ -1,5 +1,5 @@
 // LANGUAGE_VERSION: 1.2
-// WITH_REFLECT
+// WITH_RUNTIME
 // IGNORE_BACKEND: JS, NATIVE
 
 import kotlin.UninitializedPropertyAccessException
@@ -15,6 +15,6 @@ fun box(): String {
         return "OK"
     }
     catch (e: Throwable) {
-        return "Unexpected exception: ${e::class.qualifiedName}"
+        return "Unexpected exception: ${e::class}"
     }
 }
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/properties/lateinit/topLevel/accessorException.kt b/compiler/testData/codegen/box/properties/lateinit/topLevel/accessorException.kt
index 3ee4f2a93c2..30bae3b69c4 100644
--- a/compiler/testData/codegen/box/properties/lateinit/topLevel/accessorException.kt
+++ b/compiler/testData/codegen/box/properties/lateinit/topLevel/accessorException.kt
@@ -1,5 +1,5 @@
 // LANGUAGE_VERSION: 1.2
-// WITH_REFLECT
+// WITH_RUNTIME
 // IGNORE_BACKEND: JS, NATIVE
 // FILE: lateinit.kt
 private lateinit var s: String
@@ -22,7 +22,7 @@ fun box(): String {
         return "OK"
     }
     catch (e: Throwable) {
-        return "Unexpected exception: ${e::class.qualifiedName}"
+        return "Unexpected exception: ${e::class}"
     }
 
 }
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedMemberAccess.kt b/compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedMemberAccess.kt
index a53e3981d63..fc3196b47a7 100644
--- a/compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedMemberAccess.kt
+++ b/compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedMemberAccess.kt
@@ -1,5 +1,5 @@
 // LANGUAGE_VERSION: 1.2
-// WITH_REFLECT
+// WITH_RUNTIME
 // IGNORE_BACKEND: JS, NATIVE
 
 import kotlin.UninitializedPropertyAccessException
@@ -16,6 +16,6 @@ fun box(): String {
         return "OK"
     }
     catch (e: Throwable) {
-        return "Unexpected exception: ${e::class.qualifiedName}"
+        return "Unexpected exception: ${e::class}"
     }
 }
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedRead.kt b/compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedRead.kt
index 66b1eeffadd..fdf0050122b 100644
--- a/compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedRead.kt
+++ b/compiler/testData/codegen/box/properties/lateinit/topLevel/uninitializedRead.kt
@@ -1,5 +1,5 @@
 // LANGUAGE_VERSION: 1.2
-// WITH_REFLECT
+// WITH_RUNTIME
 // IGNORE_BACKEND: JS, NATIVE
 
 import kotlin.UninitializedPropertyAccessException
@@ -16,6 +16,6 @@ fun box(): String {
         return "OK"
     }
     catch (e: Throwable) {
-        return "Unexpected exception: ${e::class.qualifiedName}"
+        return "Unexpected exception: ${e::class}"
     }
 }
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java
index e8eb40d96a3..fb1506fe998 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsTestWithStdLibUsingJavacGenerated.java
@@ -84,6 +84,12 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno
         doTest(fileName);
     }
 
+    @TestMetadata("hugeUnresolvedKotlinxHtml.kt")
+    public void testHugeUnresolvedKotlinxHtml() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/hugeUnresolvedKotlinxHtml.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("ifElseJavaList.kt")
     public void testIfElseJavaList() throws Exception {
         String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/ifElseJavaList.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
index f1916a19174..e1dae0464af 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
@@ -13053,6 +13053,33 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/lateinit/setter.kt");
                 doTest(fileName);
             }
+
+            @TestMetadata("compiler/testData/diagnostics/tests/lateinit/local")
+            @TestDataPath("$PROJECT_ROOT")
+            @RunWith(JUnit3RunnerWithInners.class)
+            public static class Local extends AbstractDiagnosticsUsingJavacTest {
+                public void testAllFilesPresentInLocal() throws Exception {
+                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/lateinit/local"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
+                }
+
+                @TestMetadata("inapplicableLateinitModifier.kt")
+                public void testInapplicableLateinitModifier() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/lateinit/local/inapplicableLateinitModifier.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("localLateinit.kt")
+                public void testLocalLateinit() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/lateinit/local/localLateinit.kt");
+                    doTest(fileName);
+                }
+
+                @TestMetadata("uninitialized.kt")
+                public void testUninitialized() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/lateinit/local/uninitialized.kt");
+                    doTest(fileName);
+                }
+            }
         }
 
         @TestMetadata("compiler/testData/diagnostics/tests/library")
@@ -16174,6 +16201,12 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
                 doTest(fileName);
             }
 
+            @TestMetadata("lateinitOnTopLevel.kt")
+            public void testLateinitOnTopLevel() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/properties/lateinitOnTopLevel.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("compiler/testData/diagnostics/tests/properties/inferenceFromGetters")
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)
@@ -18129,6 +18162,12 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
                     doTest(fileName);
                 }
 
+                @TestMetadata("manyInapplicableCandidatesWithLambdas.kt")
+                public void testManyInapplicableCandidatesWithLambdas() throws Exception {
+                    String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls/manyInapplicableCandidatesWithLambdas.kt");
+                    doTest(fileName);
+                }
+
                 @TestMetadata("twoTypeParameters.kt")
                 public void testTwoTypeParameters() throws Exception {
                     String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls/twoTypeParameters.kt");