diff --git a/compiler/testData/lazyResolve/diagnostics/NamespaceAsExpression.txt b/compiler/testData/lazyResolve/diagnostics/NamespaceAsExpression.txt
new file mode 100644
index 00000000000..75b2efa1e19
--- /dev/null
+++ b/compiler/testData/lazyResolve/diagnostics/NamespaceAsExpression.txt
@@ -0,0 +1,12 @@
+namespace <root>
+
+// <namespace name="root">
+namespace root
+
+// <namespace name="a">
+namespace a
+
+// </namespace name="a">
+internal final val x: [ERROR : Type for a]
+internal final val y2: [ERROR : Type for package]
+// </namespace name="root">
diff --git a/compiler/testData/lazyResolve/diagnostics/ResolveToJava.txt b/compiler/testData/lazyResolve/diagnostics/ResolveToJava.txt
new file mode 100644
index 00000000000..88b5d35e9d2
--- /dev/null
+++ b/compiler/testData/lazyResolve/diagnostics/ResolveToJava.txt
@@ -0,0 +1,8 @@
+namespace <root>
+
+// <namespace name="xxx">
+namespace xxx
+
+// </namespace name="xxx">
+internal final val l: java.util.List<in jet.Int>
+internal final fun test(/*0*/ l: java.util.List<jet.Int>): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/redeclarations/MultiFilePackageRedeclaration.txt b/compiler/testData/lazyResolve/diagnostics/redeclarations/MultiFilePackageRedeclaration.txt
new file mode 100644
index 00000000000..ea9c6945fdb
--- /dev/null
+++ b/compiler/testData/lazyResolve/diagnostics/redeclarations/MultiFilePackageRedeclaration.txt
@@ -0,0 +1,13 @@
+namespace <root>
+
+// <namespace name="a">
+namespace a
+
+// <namespace name="b">
+namespace b
+
+// </namespace name="b">
+internal final class a.b : jet.Any {
+    public final /*constructor*/ fun <init>(): a.b
+}
+// </namespace name="a">
diff --git a/compiler/testData/lazyResolve/diagnostics/redeclarations/kt2247.txt b/compiler/testData/lazyResolve/diagnostics/redeclarations/kt2247.txt
new file mode 100644
index 00000000000..7b14d58a7a5
--- /dev/null
+++ b/compiler/testData/lazyResolve/diagnostics/redeclarations/kt2247.txt
@@ -0,0 +1,18 @@
+namespace <root>
+
+// <namespace name="kt2247">
+namespace kt2247
+
+internal final class kt2247.B : jet.Any {
+    public final /*constructor*/ fun <init>(): kt2247.B
+    internal final class kt2247.B.Y : jet.Any {
+        public final /*constructor*/ fun <init>(): kt2247.B.Y
+    }
+    internal final class object kt2247.B.<no name provided> : jet.Any {
+        internal final /*constructor*/ fun <init>(): kt2247.B.<no name provided>
+        internal final class kt2247.B.<no name provided>.Y : jet.Any {
+            public final /*constructor*/ fun <init>(): kt2247.B.<no name provided>.Y
+        }
+    }
+}
+// </namespace name="kt2247">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt26-1.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt26-1.txt
new file mode 100644
index 00000000000..c797b60066a
--- /dev/null
+++ b/compiler/testData/lazyResolve/diagnostics/regressions/kt26-1.txt
@@ -0,0 +1,10 @@
+namespace <root>
+
+// <namespace name="foo">
+namespace foo
+
+// </namespace name="foo">
+// <namespace name="bar">
+namespace bar
+
+// </namespace name="bar">
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt691.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt691.txt
new file mode 100644
index 00000000000..59032b1330c
--- /dev/null
+++ b/compiler/testData/lazyResolve/diagnostics/regressions/kt691.txt
@@ -0,0 +1,14 @@
+namespace <root>
+
+// <namespace name="foo">
+namespace foo
+
+// <namespace name="bar">
+namespace bar
+
+// <namespace name="buz">
+namespace buz
+
+// </namespace name="buz">
+// </namespace name="bar">
+// </namespace name="foo">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/Imports-hidden.txt b/compiler/testData/lazyResolve/diagnostics/scopes/Imports-hidden.txt
new file mode 100644
index 00000000000..4371ead246a
--- /dev/null
+++ b/compiler/testData/lazyResolve/diagnostics/scopes/Imports-hidden.txt
@@ -0,0 +1,16 @@
+namespace <root>
+
+// <namespace name="a">
+namespace a
+
+// </namespace name="a">
+// <namespace name="b">
+namespace b
+
+internal final val O: b.O
+// </namespace name="b">
+// <namespace name="c">
+namespace c
+
+internal final val O: c.O
+// </namespace name="c">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/ImportsConflicting.txt b/compiler/testData/lazyResolve/diagnostics/scopes/ImportsConflicting.txt
new file mode 100644
index 00000000000..811a9bcabf7
--- /dev/null
+++ b/compiler/testData/lazyResolve/diagnostics/scopes/ImportsConflicting.txt
@@ -0,0 +1,16 @@
+namespace <root>
+
+// <namespace name="a">
+namespace a
+
+// </namespace name="a">
+// <namespace name="b">
+namespace b
+
+internal final fun foo(): jet.Int
+// </namespace name="b">
+// <namespace name="c">
+namespace c
+
+internal final fun foo(): jet.Int
+// </namespace name="c">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/ImportsUselessSimpleImport2.txt b/compiler/testData/lazyResolve/diagnostics/scopes/ImportsUselessSimpleImport2.txt
new file mode 100644
index 00000000000..00624fddb8a
--- /dev/null
+++ b/compiler/testData/lazyResolve/diagnostics/scopes/ImportsUselessSimpleImport2.txt
@@ -0,0 +1,13 @@
+namespace <root>
+
+// <namespace name="a">
+namespace a
+
+// </namespace name="a">
+// <namespace name="b">
+namespace b
+
+internal final class b.B : jet.Any {
+    public final /*constructor*/ fun <init>(): b.B
+}
+// </namespace name="b">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt1080.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt1080.txt
new file mode 100644
index 00000000000..72425dfddb2
--- /dev/null
+++ b/compiler/testData/lazyResolve/diagnostics/scopes/kt1080.txt
@@ -0,0 +1,14 @@
+namespace <root>
+
+// <namespace name="kt1080">
+namespace kt1080
+
+// </namespace name="kt1080">
+// <namespace name="b">
+namespace b
+
+// <namespace name="d">
+namespace d
+
+// </namespace name="d">
+// </namespace name="b">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt1579.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt1579.txt
new file mode 100644
index 00000000000..690a2e8fa20
--- /dev/null
+++ b/compiler/testData/lazyResolve/diagnostics/scopes/kt1579.txt
@@ -0,0 +1,14 @@
+namespace <root>
+
+// <namespace name="lib">
+namespace lib
+
+internal abstract trait lib.WithInner : jet.Any {
+    internal abstract trait lib.WithInner.Inner : jet.Any {
+    }
+}
+// </namespace name="lib">
+// <namespace name="user">
+namespace user
+
+// </namespace name="user">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt1642.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt1642.txt
new file mode 100644
index 00000000000..46adece16cb
--- /dev/null
+++ b/compiler/testData/lazyResolve/diagnostics/scopes/kt1642.txt
@@ -0,0 +1,10 @@
+namespace <root>
+
+// <namespace name="a">
+namespace a
+
+// <namespace name="java">
+namespace java
+
+// </namespace name="java">
+// </namespace name="a">