diff --git a/nj2k/tests/org/jetbrains/kotlin/nj2k/StructuralPsiCompare.kt b/nj2k/tests/org/jetbrains/kotlin/nj2k/StructuralPsiCompare.kt
index dd60072c019..bc911b7444f 100644
--- a/nj2k/tests/org/jetbrains/kotlin/nj2k/StructuralPsiCompare.kt
+++ b/nj2k/tests/org/jetbrains/kotlin/nj2k/StructuralPsiCompare.kt
@@ -11,20 +11,24 @@ import com.intellij.psi.PsiElementVisitor
 import com.intellij.psi.PsiWhiteSpace
 import com.intellij.psi.impl.source.tree.LeafPsiElement
 import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.psi.KtImportDirective
 
 internal fun KtFile.dumpStructureText(): String {
     val sb = StringBuilder()
     this.accept(object : PsiElementVisitor() {
         override fun visitElement(element: PsiElement?) {
-            if (element is PsiComment) {
-                return
-            }
             if (element is PsiWhiteSpace) {
                 if (sb.lastOrNull() !in listOf(' ', '{', '}', '(', ')')) {
                     sb.append(" ")
                 }
                 return
             }
+            if (element is KtImportDirective) {
+                return
+            }
+            if (element is PsiComment && (element.text.startsWith("// ERROR") || element.text.startsWith("// !"))) {
+                return
+            }
             if (element is LeafPsiElement) {
                 sb.append(element.text)
                 return