diff --git a/compiler/testData/diagnostics/tests/PackageInTypePosition.txt b/compiler/testData/diagnostics/tests/PackageInTypePosition.txt
index c799adf784d..66dad6df0d1 100644
--- a/compiler/testData/diagnostics/tests/PackageInTypePosition.txt
+++ b/compiler/testData/diagnostics/tests/PackageInTypePosition.txt
@@ -1,6 +1,3 @@
 package
 
 @[ERROR : foo] /* annotation class not found */ public fun bar(/*0*/ p: [ERROR : foo]): [ERROR : foo]
-
-package foo {
-}
diff --git a/compiler/testData/diagnostics/tests/ResolveToJava.txt b/compiler/testData/diagnostics/tests/ResolveToJava.txt
index 5b20f2d697f..9a54c6bdc05 100644
--- a/compiler/testData/diagnostics/tests/ResolveToJava.txt
+++ b/compiler/testData/diagnostics/tests/ResolveToJava.txt
@@ -2,6 +2,3 @@ package
 
 public val l: kotlin.collections.MutableList<in kotlin.Int>
 public fun test(/*0*/ l: java.util.List<kotlin.Int>): kotlin.Unit
-
-package xxx {
-}
diff --git a/compiler/testData/diagnostics/tests/callableReference/classVsPackage.txt b/compiler/testData/diagnostics/tests/callableReference/classVsPackage.txt
index a7f8c68bc42..32a7d8f2179 100644
--- a/compiler/testData/diagnostics/tests/callableReference/classVsPackage.txt
+++ b/compiler/testData/diagnostics/tests/callableReference/classVsPackage.txt
@@ -40,12 +40,6 @@ package a {
 // -- Module: <m3> --
 package
 
-package a {
-
-    package a.b {
-    }
-}
-
 package test {
     public fun test(): kotlin.reflect.KFunction1<a.b.c, kotlin.Unit>
 }
diff --git a/compiler/testData/diagnostics/tests/evaluate/inlineClasses/constructorOfUnsignedType.txt b/compiler/testData/diagnostics/tests/evaluate/inlineClasses/constructorOfUnsignedType.txt
index c8941179afe..52ba993570d 100644
--- a/compiler/testData/diagnostics/tests/evaluate/inlineClasses/constructorOfUnsignedType.txt
+++ b/compiler/testData/diagnostics/tests/evaluate/inlineClasses/constructorOfUnsignedType.txt
@@ -92,49 +92,4 @@ package kotlin {
         public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
     }
-
-    package kotlin.annotation {
-    }
-
-    package kotlin.collections {
-    }
-
-    package kotlin.internal {
-
-        package kotlin.internal.contracts {
-        }
-    }
-
-    package kotlin.ranges {
-    }
-
-    package kotlin.reflect {
-    }
-
-    package kotlin.script {
-
-        package kotlin.script.dependencies {
-        }
-
-        package kotlin.script.experimental {
-
-            package kotlin.script.experimental.dependencies {
-            }
-
-            package kotlin.script.experimental.location {
-            }
-        }
-
-        package kotlin.script.extensions {
-        }
-
-        package kotlin.script.templates {
-
-            package kotlin.script.templates.standard {
-            }
-        }
-    }
-
-    package kotlin.text {
-    }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/PseudoRawTypes.txt b/compiler/testData/diagnostics/tests/generics/PseudoRawTypes.txt
index 72295e959e8..300e0b95aa8 100644
--- a/compiler/testData/diagnostics/tests/generics/PseudoRawTypes.txt
+++ b/compiler/testData/diagnostics/tests/generics/PseudoRawTypes.txt
@@ -2,48 +2,6 @@ package
 
 package java {
 
-    package java.awt {
-
-        package java.awt.event {
-        }
-    }
-
-    package java.beans {
-
-        package java.beans.beancontext {
-        }
-    }
-
-    package java.io {
-    }
-
-    package java.lang {
-
-        package java.lang.annotation {
-        }
-
-        package java.lang.reflect {
-        }
-    }
-
-    package java.net {
-    }
-
-    package java.nio {
-
-        package java.nio.charset {
-        }
-    }
-
-    package java.rmi {
-    }
-
-    package java.security {
-    }
-
-    package java.sql {
-    }
-
     package java.util {
 
         public open class Collection {
@@ -53,18 +11,6 @@ package java {
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
-
-        package java.util.concurrent {
-
-            package java.util.concurrent.atomic {
-            }
-
-            package java.util.concurrent.locks {
-            }
-        }
-
-        package java.util.regex {
-        }
     }
 }
 
diff --git a/compiler/testData/diagnostics/tests/imports/CheckJavaVisibility.txt b/compiler/testData/diagnostics/tests/imports/CheckJavaVisibility.txt
index 6e50bdaafef..9a65aa809d2 100644
--- a/compiler/testData/diagnostics/tests/imports/CheckJavaVisibility.txt
+++ b/compiler/testData/diagnostics/tests/imports/CheckJavaVisibility.txt
@@ -47,6 +47,3 @@ package j {
         public open fun javaM(): kotlin.Unit
     }
 }
-
-package k {
-}
diff --git a/compiler/testData/diagnostics/tests/imports/CheckVisibility.txt b/compiler/testData/diagnostics/tests/imports/CheckVisibility.txt
index 38a3307333f..6af6faf3f6d 100644
--- a/compiler/testData/diagnostics/tests/imports/CheckVisibility.txt
+++ b/compiler/testData/diagnostics/tests/imports/CheckVisibility.txt
@@ -39,18 +39,7 @@ package k {
     }
 }
 
-package k2 {
-}
-
 
 // -- Module: <m2> --
 package
 
-package k {
-}
-
-package k2 {
-}
-
-package k3 {
-}
diff --git a/compiler/testData/diagnostics/tests/imports/ClassClash.txt b/compiler/testData/diagnostics/tests/imports/ClassClash.txt
index c2ba9b521e8..e92c79007c4 100644
--- a/compiler/testData/diagnostics/tests/imports/ClassClash.txt
+++ b/compiler/testData/diagnostics/tests/imports/ClassClash.txt
@@ -33,9 +33,6 @@ package
 
 public fun test(/*0*/ b: a.B): kotlin.Unit
 
-package a {
-}
-
 
 // -- Module: <top_m1> --
 package
diff --git a/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.txt b/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.txt
index 67eb8dbf8ce..d57fdc91579 100644
--- a/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.txt
+++ b/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.txt
@@ -33,9 +33,6 @@ package
 
 public fun test(/*0*/ b: a.B): kotlin.Unit
 
-package a {
-}
-
 
 // -- Module: <top_m1> --
 package
diff --git a/compiler/testData/diagnostics/tests/imports/ClassImportsConflicting.txt b/compiler/testData/diagnostics/tests/imports/ClassImportsConflicting.txt
index b6cf089ba7c..497366fb48a 100644
--- a/compiler/testData/diagnostics/tests/imports/ClassImportsConflicting.txt
+++ b/compiler/testData/diagnostics/tests/imports/ClassImportsConflicting.txt
@@ -1,8 +1,5 @@
 package
 
-package a {
-}
-
 package b {
 
     public object O {
diff --git a/compiler/testData/diagnostics/tests/imports/ImportsConflicting.txt b/compiler/testData/diagnostics/tests/imports/ImportsConflicting.txt
index cab2339ac91..f572a4c8966 100644
--- a/compiler/testData/diagnostics/tests/imports/ImportsConflicting.txt
+++ b/compiler/testData/diagnostics/tests/imports/ImportsConflicting.txt
@@ -1,8 +1,5 @@
 package
 
-package a {
-}
-
 package b {
     public fun foo(): kotlin.Int
 }
diff --git a/compiler/testData/diagnostics/tests/imports/MalformedImports.txt b/compiler/testData/diagnostics/tests/imports/MalformedImports.txt
index da8f5c10690..0b9dba360e1 100644
--- a/compiler/testData/diagnostics/tests/imports/MalformedImports.txt
+++ b/compiler/testData/diagnostics/tests/imports/MalformedImports.txt
@@ -1,4 +1,2 @@
 package
 
-package test {
-}
diff --git a/compiler/testData/diagnostics/tests/imports/PackageVsClass.txt b/compiler/testData/diagnostics/tests/imports/PackageVsClass.txt
index 62e353c247f..53b074e7577 100644
--- a/compiler/testData/diagnostics/tests/imports/PackageVsClass.txt
+++ b/compiler/testData/diagnostics/tests/imports/PackageVsClass.txt
@@ -58,9 +58,6 @@ public fun test2(/*0*/ ab_c: a.b.c): kotlin.Unit
 package a {
     public fun test(/*0*/ a_b: a.b): kotlin.Unit
     public fun test2(/*0*/ ab_c: a.b.c): kotlin.Unit
-
-    package a.b {
-    }
 }
 
 
@@ -73,7 +70,4 @@ public fun test2(/*0*/ ab_c: a.b.c): kotlin.Unit
 package a {
     public fun test(/*0*/ a_b: a.b): kotlin.Unit
     public fun test2(/*0*/ ab_c: a.b.c): kotlin.Unit
-
-    package a.b {
-    }
 }
diff --git a/compiler/testData/diagnostics/tests/imports/TopLevelClassVsPackage.txt b/compiler/testData/diagnostics/tests/imports/TopLevelClassVsPackage.txt
index 23593f3b204..21b3b083234 100644
--- a/compiler/testData/diagnostics/tests/imports/TopLevelClassVsPackage.txt
+++ b/compiler/testData/diagnostics/tests/imports/TopLevelClassVsPackage.txt
@@ -50,6 +50,3 @@ package
 public fun test(/*0*/ a_b: a.b): kotlin.Unit
 public fun test2(/*0*/ _a: a): kotlin.Unit
 public fun test3(/*0*/ _a: a): kotlin.Unit
-
-package a {
-}
diff --git a/compiler/testData/diagnostics/tests/imports/WrongImport.txt b/compiler/testData/diagnostics/tests/imports/WrongImport.txt
index 323653f8d9b..21c18784406 100644
--- a/compiler/testData/diagnostics/tests/imports/WrongImport.txt
+++ b/compiler/testData/diagnostics/tests/imports/WrongImport.txt
@@ -44,7 +44,4 @@ package a {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
     }
-
-    package a.b {
-    }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArguments.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArguments.txt
index fcd07071bda..298558bf59a 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArguments.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArguments.txt
@@ -39,6 +39,3 @@ package p {
 package
 
 public fun test(): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArgumentsReversed.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArgumentsReversed.txt
index 7f3dee5313b..862a633d9be 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArgumentsReversed.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArgumentsReversed.txt
@@ -39,6 +39,3 @@ package p {
 package
 
 public fun test(): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateClass.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateClass.txt
index 4dc3decd662..4a47222838a 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateClass.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateClass.txt
@@ -40,6 +40,3 @@ package p {
 package
 
 public fun test(): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.txt
index 1429569ba99..042ee7a5fe4 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.txt
@@ -149,6 +149,3 @@ package p {
 package
 
 public fun test(/*0*/ m1: p.M1): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.txt
index 2e54f268a65..02213b764aa 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.txt
@@ -44,6 +44,3 @@ package p {
 package
 
 public fun test(): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.txt
index f4a73715877..09ee56f2780 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.txt
@@ -39,6 +39,3 @@ package p {
 package
 
 public fun test(): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.txt
index f7b45a825c1..6e65e2a3acf 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.txt
@@ -70,6 +70,3 @@ package p {
 package
 
 public fun test(): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/members.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/members.txt
index 39fa3dccfd9..c85023fa316 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/members.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/members.txt
@@ -48,6 +48,3 @@ package p {
 package
 
 public fun test(/*0*/ a: p.A): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.txt
index 61772be459a..9586c2cdd58 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.txt
@@ -31,6 +31,3 @@ public final class A {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameGenericArguments.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameGenericArguments.txt
index 648e84de086..245adac56cc 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameGenericArguments.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameGenericArguments.txt
@@ -39,6 +39,3 @@ package p {
 package
 
 public fun test(): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.txt
index 5411840cc8a..2e5ededd6ec 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.txt
@@ -44,6 +44,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B<kotlin.String>?): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.txt
index 08886c16a9e..17e221a128b 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.txt
@@ -50,6 +50,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B<p.Tr>?): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.txt
index 5073661fe33..06abb324294 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.txt
@@ -44,6 +44,3 @@ package p {
 package
 
 public fun </*0*/ Y, /*1*/ Z> test(/*0*/ b: p.B<Y, Z>?): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.txt
index 156a4501fca..763f5b64969 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.txt
@@ -44,6 +44,3 @@ package p {
 package
 
 public fun </*0*/ Y> test(/*0*/ b: p.B<Y>?, /*1*/ y: Y): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.txt
index 894fb64e2cd..0919fdebad3 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.txt
@@ -44,6 +44,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B<kotlin.String>?): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.txt
index ef455ee955b..dc6bf1616d1 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.txt
@@ -44,6 +44,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B?, /*1*/ c: p.C): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.txt
index c4cde35c130..360c440f5b2 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.txt
@@ -44,6 +44,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.txt
index 5b0ae7b8dce..db602f386ea 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.txt
@@ -44,6 +44,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.txt
index ae3ff0ee35d..dd9bfd77d51 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.txt
@@ -63,6 +63,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.txt
index 8ccd10e3a60..ead8e55e270 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.txt
@@ -44,6 +44,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.txt
index 1eb3eb93a07..419094cbcc2 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.txt
@@ -44,6 +44,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.txt
index ec178199538..682114ec31c 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.txt
@@ -45,6 +45,3 @@ package p {
 package
 
 public fun p.B.test(): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.txt
index 47383d5c6f4..98822761a81 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.txt
@@ -45,6 +45,3 @@ package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
 public fun test1(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.txt
index fd873bda6a5..cf904dd9696 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.txt
@@ -50,6 +50,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.txt
index 424fd535424..21978d7665c 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.txt
@@ -47,6 +47,3 @@ public fun test(/*0*/ b: p.B?): kotlin.Unit
 public fun test1(/*0*/ b: p.B?): kotlin.Unit
 public fun test2(/*0*/ b: p.B?): kotlin.Unit
 public fun test3(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.txt
index 47383d5c6f4..98822761a81 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.txt
@@ -45,6 +45,3 @@ package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
 public fun test1(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.txt
index 1f2ad8f40e1..71c83edfaa9 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.txt
@@ -57,6 +57,3 @@ package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
 public fun test1(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.txt
index 6c996973c4e..68237b2a1d8 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.txt
@@ -45,6 +45,3 @@ package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
 public fun test1(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/incompleteCodeNoNoneApplicable.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/incompleteCodeNoNoneApplicable.txt
index e21ba77ddb8..c6f0cc3a9d8 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/incompleteCodeNoNoneApplicable.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/incompleteCodeNoNoneApplicable.txt
@@ -18,6 +18,3 @@ package p {
 package
 
 public fun test(): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.txt
index cec6fb5264b..f0995ad9284 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.txt
@@ -44,6 +44,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.txt
index 0077e18de0c..0c05d9cfc00 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.txt
@@ -45,6 +45,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.txt
index 114746edace..f3623d9097d 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.txt
@@ -63,6 +63,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B?, /*1*/ a: p.G1<kotlin.Int>, /*2*/ b1: p.G2<p.B, kotlin.String>): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.txt
index 93e65e6ff65..c40fd69c19f 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.txt
@@ -51,6 +51,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sinceKotlin.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sinceKotlin.txt
index d86beb992c8..f74920a9504 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sinceKotlin.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sinceKotlin.txt
@@ -19,9 +19,3 @@ package
 
 public fun test1(): kotlin.Int
 public fun test2(): kotlin.Int
-
-package p1 {
-}
-
-package p2 {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.txt
index 3dd0e6534b6..6840cd203cd 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.txt
@@ -44,6 +44,3 @@ package p {
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.txt
index ac37dc9f598..44854ad1ecd 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.txt
@@ -57,6 +57,3 @@ public final class Foo : p.C, p.B {
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.txt
index c0af3b8aae0..c2ecd847cf0 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.txt
@@ -50,6 +50,3 @@ public final class Foo : p.A, p.B {
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.txt
index 48124910f81..7c4bf31fcb5 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.txt
@@ -51,6 +51,3 @@ public final class Foo : p.A, p.B {
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.txt
index 7edb22ef57d..b58fdd3fcfb 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.txt
@@ -50,6 +50,3 @@ public final class Foo : p.A<kotlin.String>, p.B {
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/hiddenClass/deprecatedHiddenImportPriority.txt b/compiler/testData/diagnostics/tests/multimodule/hiddenClass/deprecatedHiddenImportPriority.txt
index e0bffdff9e9..baa2f7f20e3 100644
--- a/compiler/testData/diagnostics/tests/multimodule/hiddenClass/deprecatedHiddenImportPriority.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/hiddenClass/deprecatedHiddenImportPriority.txt
@@ -33,9 +33,3 @@ package
 
 public fun test(/*0*/ a: p1.A): kotlin.Unit
 public fun test(/*0*/ a: p2.A): kotlin.Unit
-
-package p1 {
-}
-
-package p2 {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/hiddenClass/deprecatedHiddenMultipleClasses.txt b/compiler/testData/diagnostics/tests/multimodule/hiddenClass/deprecatedHiddenMultipleClasses.txt
index 4d728e18e8d..6f2ee1bbda5 100644
--- a/compiler/testData/diagnostics/tests/multimodule/hiddenClass/deprecatedHiddenMultipleClasses.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/hiddenClass/deprecatedHiddenMultipleClasses.txt
@@ -48,12 +48,3 @@ package
 
 public fun test(/*0*/ a: [ERROR : A]): kotlin.Unit
 public fun test(/*0*/ a: p2.A): kotlin.Unit
-
-package p1 {
-}
-
-package p2 {
-}
-
-package p3 {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/hiddenClass/sinceKotlinImportPriority.txt b/compiler/testData/diagnostics/tests/multimodule/hiddenClass/sinceKotlinImportPriority.txt
index 0921f12c68f..361a4dbcc69 100644
--- a/compiler/testData/diagnostics/tests/multimodule/hiddenClass/sinceKotlinImportPriority.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/hiddenClass/sinceKotlinImportPriority.txt
@@ -33,9 +33,3 @@ package
 
 public fun test(/*0*/ a: p1.A): kotlin.Unit
 public fun test(/*0*/ a: p2.A): kotlin.Unit
-
-package p1 {
-}
-
-package p2 {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/hiddenClass/sinceKotlinMultipleClasses.txt b/compiler/testData/diagnostics/tests/multimodule/hiddenClass/sinceKotlinMultipleClasses.txt
index 1e08969bd89..f35f3cc8219 100644
--- a/compiler/testData/diagnostics/tests/multimodule/hiddenClass/sinceKotlinMultipleClasses.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/hiddenClass/sinceKotlinMultipleClasses.txt
@@ -48,12 +48,3 @@ package
 
 public fun test(/*0*/ a: [ERROR : A]): kotlin.Unit
 public fun test(/*0*/ a: p2.A): kotlin.Unit
-
-package p1 {
-}
-
-package p2 {
-}
-
-package p3 {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/internal.txt b/compiler/testData/diagnostics/tests/multimodule/internal.txt
index ca3f1b37d60..456073a4ff5 100644
--- a/compiler/testData/diagnostics/tests/multimodule/internal.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/internal.txt
@@ -36,6 +36,3 @@ package p {
 package
 
 public fun test(): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/publishedApiInternal.txt b/compiler/testData/diagnostics/tests/multimodule/publishedApiInternal.txt
index f917c24cbf0..175747564ce 100644
--- a/compiler/testData/diagnostics/tests/multimodule/publishedApiInternal.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/publishedApiInternal.txt
@@ -37,6 +37,3 @@ package
 
 public fun test(): kotlin.Unit
 public inline fun testInline(): kotlin.Unit
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/redundantElseInWhen.txt b/compiler/testData/diagnostics/tests/multimodule/redundantElseInWhen.txt
index 9b6e28bc442..c19631cbcf7 100644
--- a/compiler/testData/diagnostics/tests/multimodule/redundantElseInWhen.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/redundantElseInWhen.txt
@@ -47,6 +47,3 @@ package other {
     public fun baz(/*0*/ b: kotlin.Boolean?): kotlin.Int
     public fun foo(/*0*/ e: test.E): kotlin.Int
 }
-
-package test {
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/varargConflict.txt b/compiler/testData/diagnostics/tests/multimodule/varargConflict.txt
index 16f27d03167..aaced474e55 100644
--- a/compiler/testData/diagnostics/tests/multimodule/varargConflict.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/varargConflict.txt
@@ -22,6 +22,3 @@ package
 package m {
     public fun main(): kotlin.Unit
 }
-
-package p {
-}
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.txt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.txt
index 79457698488..befbce3ce51 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.txt
@@ -9,9 +9,6 @@ package common {
 // -- Module: <m2-jvm> --
 package
 
-package common {
-}
-
 package jvm {
     public actual fun foo(): kotlin.Unit
 }
@@ -20,9 +17,6 @@ package jvm {
 // -- Module: <m3-js> --
 package
 
-package common {
-}
-
 package js {
     public actual fun foo(): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/GenericClassVsPackage.txt b/compiler/testData/diagnostics/tests/qualifiedExpression/GenericClassVsPackage.txt
index dd031de2010..bf0b415c4c8 100644
--- a/compiler/testData/diagnostics/tests/qualifiedExpression/GenericClassVsPackage.txt
+++ b/compiler/testData/diagnostics/tests/qualifiedExpression/GenericClassVsPackage.txt
@@ -44,12 +44,6 @@ package
 public fun test(/*0*/ ab_c: a.b.c): kotlin.Unit
 public fun test2(/*0*/ ab_c: a.b.c): kotlin.Unit
 
-package a {
-
-    package a.b {
-    }
-}
-
 
 // -- Module: <top_m1> --
 package
@@ -91,6 +85,3 @@ package
 
 public fun test(/*0*/ a_b: a.b): kotlin.Unit
 public fun test2(/*0*/ _ab: a.b): kotlin.Unit
-
-package a {
-}
diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsClass.txt b/compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsClass.txt
index ebedca6d478..23ce2a51557 100644
--- a/compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsClass.txt
+++ b/compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsClass.txt
@@ -55,12 +55,6 @@ package
 public fun test(/*0*/ a_b: a.b): kotlin.Unit
 public fun test2(/*0*/ ab_c: a.b.c): kotlin.Unit
 
-package a {
-
-    package a.b {
-    }
-}
-
 
 // -- Module: <m1> --
 package
@@ -109,9 +103,3 @@ package
 
 public fun test(/*0*/ a_b: a.b): kotlin.Unit
 public fun test2(/*0*/ ab_c: a.b.c): kotlin.Unit
-
-package a {
-
-    package a.b {
-    }
-}
diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsClass2.txt b/compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsClass2.txt
index 6c5415b7c2f..3b7f3ac663c 100644
--- a/compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsClass2.txt
+++ b/compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsClass2.txt
@@ -30,9 +30,6 @@ package a {
 // -- Module: <m2> --
 package
 
-package a {
-}
-
 package test {
     public val x: [ERROR : Type for a.b()]
 
@@ -48,9 +45,6 @@ package test {
 // -- Module: <m3> --
 package
 
-package a {
-}
-
 package test {
     public fun foo(/*0*/ i: a.a): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/visibleClassVsQualifiedClass.txt b/compiler/testData/diagnostics/tests/qualifiedExpression/visibleClassVsQualifiedClass.txt
index 8f654dd190b..608b9142060 100644
--- a/compiler/testData/diagnostics/tests/qualifiedExpression/visibleClassVsQualifiedClass.txt
+++ b/compiler/testData/diagnostics/tests/qualifiedExpression/visibleClassVsQualifiedClass.txt
@@ -38,9 +38,6 @@ package some {
 // -- Module: <m3> --
 package
 
-package a {
-}
-
 package other {
     public fun test(/*0*/ a_: [ERROR : a.b]): kotlin.Unit
 
diff --git a/compiler/testData/diagnostics/tests/redeclarations/MultiFilePackageRedeclaration.txt b/compiler/testData/diagnostics/tests/redeclarations/MultiFilePackageRedeclaration.txt
index 728a129f8c2..3d371a9b1c5 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/MultiFilePackageRedeclaration.txt
+++ b/compiler/testData/diagnostics/tests/redeclarations/MultiFilePackageRedeclaration.txt
@@ -8,7 +8,4 @@ package a {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
-
-    package a.b {
-    }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt26-1.txt b/compiler/testData/diagnostics/tests/regressions/kt26-1.txt
index 3efb1a48576..0b9dba360e1 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt26-1.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt26-1.txt
@@ -1,7 +1,2 @@
 package
 
-package bar {
-}
-
-package foo {
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt691.txt b/compiler/testData/diagnostics/tests/regressions/kt691.txt
index 70e4345269b..0b9dba360e1 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt691.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt691.txt
@@ -1,10 +1,2 @@
 package
 
-package foo {
-
-    package foo.bar {
-
-        package foo.bar.buz {
-        }
-    }
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/implicitReceiverProperty.txt b/compiler/testData/diagnostics/tests/resolve/implicitReceiverProperty.txt
index 860f855bf19..50e8b2fff4f 100644
--- a/compiler/testData/diagnostics/tests/resolve/implicitReceiverProperty.txt
+++ b/compiler/testData/diagnostics/tests/resolve/implicitReceiverProperty.txt
@@ -20,12 +20,6 @@ package a {
     }
 }
 
-package b {
-}
-
-package c {
-}
-
 package test {
     public val x1: kotlin.Int
     public val x3: kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1579.txt b/compiler/testData/diagnostics/tests/scopes/kt1579.txt
index 374d57e2a61..4c411f174dd 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1579.txt
+++ b/compiler/testData/diagnostics/tests/scopes/kt1579.txt
@@ -14,6 +14,3 @@ package lib {
         }
     }
 }
-
-package user {
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1642.txt b/compiler/testData/diagnostics/tests/scopes/kt1642.txt
index 74f53b2117c..0b9dba360e1 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1642.txt
+++ b/compiler/testData/diagnostics/tests/scopes/kt1642.txt
@@ -1,7 +1,2 @@
 package
 
-package a {
-
-    package a.java {
-    }
-}
diff --git a/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/typealiasesOnImport.txt b/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/typealiasesOnImport.txt
index 884d9d1ba83..d6adfafcc8a 100644
--- a/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/typealiasesOnImport.txt
+++ b/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/typealiasesOnImport.txt
@@ -11,6 +11,3 @@ package a {
     @kotlin.SinceKotlin(version = "1.1") public typealias Alias_1_1 = kotlin.String
     public typealias Since_1_1_Alias = a.Since_1_1
 }
-
-package b {
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/experimental/experimentalOnWholeModule.txt b/compiler/testData/diagnostics/testsWithStdLib/experimental/experimentalOnWholeModule.txt
index e04b8b105ef..f383dbf207a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/experimental/experimentalOnWholeModule.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/experimental/experimentalOnWholeModule.txt
@@ -16,9 +16,6 @@ package api {
 // -- Module: <usage> --
 package
 
-package api {
-}
-
 package usage {
     public fun use(): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/experimental/useExperimentalOnWholeModule.txt b/compiler/testData/diagnostics/testsWithStdLib/experimental/useExperimentalOnWholeModule.txt
index 30ea99595c0..8c3b49b17b1 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/experimental/useExperimentalOnWholeModule.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/experimental/useExperimentalOnWholeModule.txt
@@ -16,9 +16,6 @@ package api {
 // -- Module: <usage> --
 package
 
-package api {
-}
-
 package usage {
     public fun use(): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/testsWithUnsignedTypes/conversions/conversionOfSignedToUnsigned.txt b/compiler/testData/diagnostics/testsWithUnsignedTypes/conversions/conversionOfSignedToUnsigned.txt
index fbd265cd440..53dd8308d12 100644
--- a/compiler/testData/diagnostics/testsWithUnsignedTypes/conversions/conversionOfSignedToUnsigned.txt
+++ b/compiler/testData/diagnostics/testsWithUnsignedTypes/conversions/conversionOfSignedToUnsigned.txt
@@ -18,36 +18,6 @@ public fun test(): kotlin.Unit
 
 package kotlin {
 
-    package kotlin.annotation {
-    }
-
-    package kotlin.collections {
-    }
-
-    package kotlin.comparisons {
-    }
-
-    package kotlin.concurrent {
-    }
-
-    package kotlin.coroutines {
-
-        package kotlin.coroutines.experimental {
-
-            package kotlin.coroutines.experimental.intrinsics {
-            }
-
-            package kotlin.coroutines.experimental.jvm {
-
-                package kotlin.coroutines.experimental.jvm.internal {
-                }
-            }
-        }
-    }
-
-    package kotlin.experimental {
-    }
-
     package kotlin.internal {
 
         public final annotation class ImplicitIntegerCoercion : kotlin.Annotation {
@@ -56,248 +26,5 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
-
-        package kotlin.internal.contracts {
-        }
-    }
-
-    package kotlin.io {
-    }
-
-    package kotlin.jvm {
-
-        package kotlin.jvm.functions {
-        }
-
-        package kotlin.jvm.internal {
-
-            package kotlin.jvm.internal.markers {
-            }
-
-            package kotlin.jvm.internal.unsafe {
-            }
-        }
-    }
-
-    package kotlin.math {
-    }
-
-    package kotlin.properties {
-    }
-
-    package kotlin.ranges {
-    }
-
-    package kotlin.reflect {
-
-        package kotlin.reflect.full {
-        }
-
-        package kotlin.reflect.jvm {
-
-            package kotlin.reflect.jvm.internal {
-
-                package kotlin.reflect.jvm.internal.components {
-                }
-
-                package kotlin.reflect.jvm.internal.impl {
-
-                    package kotlin.reflect.jvm.internal.impl.builtins {
-
-                        package kotlin.reflect.jvm.internal.impl.builtins.functions {
-                        }
-
-                        package kotlin.reflect.jvm.internal.impl.builtins.jvm {
-                        }
-                    }
-
-                    package kotlin.reflect.jvm.internal.impl.descriptors {
-
-                        package kotlin.reflect.jvm.internal.impl.descriptors.annotations {
-                        }
-
-                        package kotlin.reflect.jvm.internal.impl.descriptors.deserialization {
-                        }
-
-                        package kotlin.reflect.jvm.internal.impl.descriptors.impl {
-                        }
-                    }
-
-                    package kotlin.reflect.jvm.internal.impl.incremental {
-
-                        package kotlin.reflect.jvm.internal.impl.incremental.components {
-                        }
-                    }
-
-                    package kotlin.reflect.jvm.internal.impl.load {
-
-                        package kotlin.reflect.jvm.internal.impl.load.java {
-
-                            package kotlin.reflect.jvm.internal.impl.load.java.components {
-                            }
-
-                            package kotlin.reflect.jvm.internal.impl.load.java.descriptors {
-                            }
-
-                            package kotlin.reflect.jvm.internal.impl.load.java.lazy {
-
-                                package kotlin.reflect.jvm.internal.impl.load.java.lazy.descriptors {
-                                }
-
-                                package kotlin.reflect.jvm.internal.impl.load.java.lazy.types {
-                                }
-                            }
-
-                            package kotlin.reflect.jvm.internal.impl.load.java.sources {
-                            }
-
-                            package kotlin.reflect.jvm.internal.impl.load.java.structure {
-                            }
-
-                            package kotlin.reflect.jvm.internal.impl.load.java.typeEnhancement {
-                            }
-                        }
-
-                        package kotlin.reflect.jvm.internal.impl.load.kotlin {
-
-                            package kotlin.reflect.jvm.internal.impl.load.kotlin.header {
-                            }
-                        }
-                    }
-
-                    package kotlin.reflect.jvm.internal.impl.metadata {
-
-                        package kotlin.reflect.jvm.internal.impl.metadata.builtins {
-                        }
-
-                        package kotlin.reflect.jvm.internal.impl.metadata.deserialization {
-                        }
-
-                        package kotlin.reflect.jvm.internal.impl.metadata.jvm {
-
-                            package kotlin.reflect.jvm.internal.impl.metadata.jvm.deserialization {
-                            }
-                        }
-                    }
-
-                    package kotlin.reflect.jvm.internal.impl.name {
-                    }
-
-                    package kotlin.reflect.jvm.internal.impl.protobuf {
-                    }
-
-                    package kotlin.reflect.jvm.internal.impl.renderer {
-                    }
-
-                    package kotlin.reflect.jvm.internal.impl.resolve {
-
-                        package kotlin.reflect.jvm.internal.impl.resolve.calls {
-
-                            package kotlin.reflect.jvm.internal.impl.resolve.calls.inference {
-                            }
-                        }
-
-                        package kotlin.reflect.jvm.internal.impl.resolve.constants {
-                        }
-
-                        package kotlin.reflect.jvm.internal.impl.resolve.descriptorUtil {
-                        }
-
-                        package kotlin.reflect.jvm.internal.impl.resolve.jvm {
-                        }
-
-                        package kotlin.reflect.jvm.internal.impl.resolve.scopes {
-
-                            package kotlin.reflect.jvm.internal.impl.resolve.scopes.receivers {
-                            }
-                        }
-                    }
-
-                    package kotlin.reflect.jvm.internal.impl.serialization {
-
-                        package kotlin.reflect.jvm.internal.impl.serialization.deserialization {
-
-                            package kotlin.reflect.jvm.internal.impl.serialization.deserialization.builtins {
-                            }
-
-                            package kotlin.reflect.jvm.internal.impl.serialization.deserialization.descriptors {
-                            }
-                        }
-                    }
-
-                    package kotlin.reflect.jvm.internal.impl.storage {
-                    }
-
-                    package kotlin.reflect.jvm.internal.impl.types {
-
-                        package kotlin.reflect.jvm.internal.impl.types.checker {
-                        }
-
-                        package kotlin.reflect.jvm.internal.impl.types.error {
-                        }
-
-                        package kotlin.reflect.jvm.internal.impl.types.typeUtil {
-                        }
-
-                        package kotlin.reflect.jvm.internal.impl.types.typesApproximation {
-                        }
-                    }
-
-                    package kotlin.reflect.jvm.internal.impl.util {
-
-                        package kotlin.reflect.jvm.internal.impl.util.capitalizeDecapitalize {
-                        }
-
-                        package kotlin.reflect.jvm.internal.impl.util.collectionUtils {
-                        }
-                    }
-
-                    package kotlin.reflect.jvm.internal.impl.utils {
-                    }
-                }
-
-                package kotlin.reflect.jvm.internal.pcollections {
-                }
-
-                package kotlin.reflect.jvm.internal.structure {
-                }
-            }
-        }
-    }
-
-    package kotlin.script {
-
-        package kotlin.script.dependencies {
-        }
-
-        package kotlin.script.experimental {
-
-            package kotlin.script.experimental.dependencies {
-            }
-
-            package kotlin.script.experimental.location {
-            }
-        }
-
-        package kotlin.script.extensions {
-        }
-
-        package kotlin.script.templates {
-
-            package kotlin.script.templates.standard {
-            }
-        }
-    }
-
-    package kotlin.sequences {
-    }
-
-    package kotlin.system {
-    }
-
-    package kotlin.test {
-    }
-
-    package kotlin.text {
     }
 }
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java
index fdd41e8c5e3..2fb5e97c7af 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.test.util;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import kotlin.Unit;
+import kotlin.text.StringsKt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
@@ -105,51 +106,58 @@ public class RecursiveDescriptorComparator {
         boolean isClassOrPackage =
                 (descriptor instanceof ClassOrPackageFragmentDescriptor || descriptor instanceof PackageViewDescriptor) && !isEnumEntry;
 
-        if (isClassOrPackage && !topLevel) {
-            printer.println();
-        }
-
-        boolean isPrimaryConstructor = descriptor instanceof ConstructorDescriptor && ((ConstructorDescriptor) descriptor).isPrimary();
-        printer.print(isPrimaryConstructor && conf.checkPrimaryConstructors ? "/*primary*/ " : "", conf.renderer.render(descriptor));
-
-        if (descriptor instanceof FunctionDescriptor && conf.checkFunctionContracts) {
-            FunctionDescriptor functionDescriptor = (FunctionDescriptor) descriptor;
-            printEffectsIfAny(functionDescriptor, printer);
-        }
-
+        StringBuilder content = new StringBuilder();
         if (isClassOrPackage) {
+            Printer child = new Printer(content, printer);
+
             if (!topLevel) {
-                printer.printlnWithNoIndent(" {").pushIndent();
-            }
-            else {
-                printer.println();
-                printer.println();
+                child.pushIndent();
             }
 
             if (descriptor instanceof ClassDescriptor) {
                 ClassDescriptor klass = (ClassDescriptor) descriptor;
-                appendSubDescriptors(descriptor, module,
-                                     klass.getDefaultType().getMemberScope(), klass.getConstructors(), printer);
+                appendSubDescriptors(descriptor, module, klass.getDefaultType().getMemberScope(), klass.getConstructors(), child);
                 MemberScope staticScope = klass.getStaticScope();
                 if (!DescriptorUtils.getAllDescriptors(staticScope).isEmpty()) {
-                    printer.println();
-                    printer.println("// Static members");
-                    appendSubDescriptors(descriptor, module, staticScope, Collections.emptyList(), printer);
+                    child.println();
+                    child.println("// Static members");
+                    appendSubDescriptors(descriptor, module, staticScope, Collections.emptyList(), child);
                 }
             }
             else if (descriptor instanceof PackageFragmentDescriptor) {
                 appendSubDescriptors(descriptor, module,
                                      ((PackageFragmentDescriptor) descriptor).getMemberScope(),
-                                     Collections.emptyList(), printer);
+                                     Collections.emptyList(), child);
             }
             else if (descriptor instanceof PackageViewDescriptor) {
                 appendSubDescriptors(descriptor, module,
                                      getPackageScopeInModule((PackageViewDescriptor) descriptor, module),
-                                     Collections.emptyList(), printer);
+                                     Collections.emptyList(), child);
             }
 
             if (!topLevel) {
-                printer.popIndent().println("}");
+                if (child.isEmpty() && (
+                        descriptor instanceof PackageFragmentDescriptor || descriptor instanceof PackageViewDescriptor
+                )) {
+                    return;
+                }
+
+                printer.println();
+            }
+        }
+
+        printDescriptor(descriptor, printer);
+
+        if (isClassOrPackage) {
+            if (!topLevel) {
+                printer.printlnWithNoIndent(" {");
+                printer.printWithNoIndent(content);
+                printer.println("}");
+            }
+            else {
+                printer.println();
+                printer.println();
+                printer.printWithNoIndent(StringsKt.trimStart(content, Printer.LINE_SEPARATOR.toCharArray()));
             }
         }
         else if (conf.checkPropertyAccessors && descriptor instanceof PropertyDescriptor) {
@@ -177,7 +185,21 @@ public class RecursiveDescriptorComparator {
         }
     }
 
-    private void printEffectsIfAny(FunctionDescriptor functionDescriptor, Printer printer) {
+    private void printDescriptor(
+            @NotNull DeclarationDescriptor descriptor,
+            @NotNull Printer printer
+    ) {
+        boolean isPrimaryConstructor = conf.checkPrimaryConstructors &&
+                                       descriptor instanceof ConstructorDescriptor && ((ConstructorDescriptor) descriptor).isPrimary();
+
+        printer.print(isPrimaryConstructor ? "/*primary*/ " : "", conf.renderer.render(descriptor));
+
+        if (descriptor instanceof FunctionDescriptor && conf.checkFunctionContracts) {
+            printEffectsIfAny((FunctionDescriptor) descriptor, printer);
+        }
+    }
+
+    private static void printEffectsIfAny(FunctionDescriptor functionDescriptor, Printer printer) {
         LazyContractProvider contractProvider = functionDescriptor.getUserData(ContractProviderKey.INSTANCE);
         if (contractProvider == null) return;
 
diff --git a/compiler/tests/org/jetbrains/kotlin/types/AbstractTypeBindingTest.kt b/compiler/tests/org/jetbrains/kotlin/types/AbstractTypeBindingTest.kt
index 9005a8138fa..98431e6242d 100644
--- a/compiler/tests/org/jetbrains/kotlin/types/AbstractTypeBindingTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/types/AbstractTypeBindingTest.kt
@@ -118,7 +118,5 @@ abstract class AbstractTypeBindingTest : KotlinTestWithEnvironment() {
             }
             popIndent()
         }
-
-        override fun toString(): String = out.toString()
     }
 }
diff --git a/core/util.runtime/src/org/jetbrains/kotlin/utils/Printer.java b/core/util.runtime/src/org/jetbrains/kotlin/utils/Printer.java
index 28c88f6d4c3..ccfb3ed5f57 100644
--- a/core/util.runtime/src/org/jetbrains/kotlin/utils/Printer.java
+++ b/core/util.runtime/src/org/jetbrains/kotlin/utils/Printer.java
@@ -24,15 +24,16 @@ import java.util.Iterator;
 
 public class Printer {
     private static final String DEFAULT_INDENTATION_UNIT = "    ";
-    private static final String LINE_SEPARATOR = System.getProperty("line.separator");
+    public static final String LINE_SEPARATOR = System.getProperty("line.separator");
 
-    protected final Appendable out;
+    private final Appendable out;
     private final int maxBlankLines;
 
-    private String indent = "";
+    private String indent;
     private final String indentUnit;
     private int blankLineCountIncludingCurrent = 0;
     private boolean withholdIndentOnce = false;
+    private int length = 0;
 
     public Printer(@NotNull Appendable out) {
         this(out, Integer.MAX_VALUE);
@@ -47,14 +48,25 @@ public class Printer {
     }
 
     public Printer(@NotNull Appendable out, int maxBlankLines, @NotNull String indentUnit) {
+        this(out, maxBlankLines, indentUnit, "");
+    }
+
+    private Printer(@NotNull Appendable out, int maxBlankLines, @NotNull String indentUnit, @NotNull String indent) {
         this.out = out;
         this.maxBlankLines = maxBlankLines;
         this.indentUnit = indentUnit;
+        this.indent = indent;
+    }
+
+    public Printer(@NotNull Appendable out, @NotNull Printer parent) {
+        this(out, parent.maxBlankLines, parent.indentUnit, parent.indent);
     }
 
     private void append(Object o) {
         try {
-            out.append(o.toString());
+            String string = o.toString();
+            out.append(string);
+            length += string.length();
         }
         catch (IOException e) {
             // Do nothing
@@ -156,4 +168,13 @@ public class Printer {
         }
         return this;
     }
+
+    public boolean isEmpty() {
+        return length == 0;
+    }
+
+    @Override
+    public String toString() {
+        return out.toString();
+    }
 }