diff --git a/nj2k/testData/newJ2k/assignmentExpression/nullability-settings.kt b/nj2k/testData/newJ2k/assignmentExpression/nullability-settings.kt
index ae0203d7b13..4470124a7e1 100644
--- a/nj2k/testData/newJ2k/assignmentExpression/nullability-settings.kt
+++ b/nj2k/testData/newJ2k/assignmentExpression/nullability-settings.kt
@@ -1,6 +1,3 @@
-// !forceNotNullTypes: false
-// !specifyLocalVariableTypeByDefault: true
-
 import java.util.HashSet
 
 internal class Foo {
diff --git a/nj2k/testData/newJ2k/class/kt-639.kt b/nj2k/testData/newJ2k/class/kt-639.kt
index 43ad72a5bfa..b450b040511 100644
--- a/nj2k/testData/newJ2k/class/kt-639.kt
+++ b/nj2k/testData/newJ2k/class/kt-639.kt
@@ -1,5 +1,3 @@
-// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K : Any!, V : Any!>(initialCapacity: Int) Please specify it explicitly.
-// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K : Any!, V : Any!>(initialCapacity: Int) Please specify it explicitly.
 package demo
 
 import java.util.HashMap
diff --git a/nj2k/testData/newJ2k/constructors/identifier.kt b/nj2k/testData/newJ2k/constructors/identifier.kt
index fd2410e795c..c663b1475ee 100644
--- a/nj2k/testData/newJ2k/constructors/identifier.kt
+++ b/nj2k/testData/newJ2k/constructors/identifier.kt
@@ -1,4 +1,3 @@
-// ERROR: Property must be initialized or be abstract
 class Identifier {
     val name: String
     private var myHasDollar = false
diff --git a/nj2k/testData/newJ2k/function/overrideObject2.kt b/nj2k/testData/newJ2k/function/overrideObject2.kt
index c60f0410aac..b50dd4e791a 100644
--- a/nj2k/testData/newJ2k/function/overrideObject2.kt
+++ b/nj2k/testData/newJ2k/function/overrideObject2.kt
@@ -1,4 +1,3 @@
-// ERROR: Unresolved reference: clone
 internal open class Base
 
 internal class X : Base(), Cloneable {
diff --git a/nj2k/testData/newJ2k/methodCallExpression/stringMethods.kt b/nj2k/testData/newJ2k/methodCallExpression/stringMethods.kt
index eb188348591..28a9b703df6 100644
--- a/nj2k/testData/newJ2k/methodCallExpression/stringMethods.kt
+++ b/nj2k/testData/newJ2k/methodCallExpression/stringMethods.kt
@@ -1,6 +1,5 @@
 // ERROR: Type mismatch: inferred type is String but Charset was expected
 // ERROR: Type mismatch: inferred type is String but Charset was expected
-// ERROR: Type mismatch: inferred type is kotlin.Comparator<String> /* = java.util.Comparator<String> */ but java.util.Comparator<String?> was expected
 import java.nio.charset.Charset
 import java.util.Comparator
 import java.util.Locale
diff --git a/nj2k/testData/newJ2k/newClassExpression/fullQualifiedName2.kt b/nj2k/testData/newJ2k/newClassExpression/fullQualifiedName2.kt
index 7a8cf4b6bd6..353eafa9b62 100644
--- a/nj2k/testData/newJ2k/newClassExpression/fullQualifiedName2.kt
+++ b/nj2k/testData/newJ2k/newClassExpression/fullQualifiedName2.kt
@@ -1,4 +1,3 @@
-// ERROR: One type argument expected for interface List<out E>
 package test
 
 internal class User {
diff --git a/nj2k/testData/newJ2k/nullability/MethodReturnsNullInAnonymousClass.kt b/nj2k/testData/newJ2k/nullability/MethodReturnsNullInAnonymousClass.kt
index ba56491f549..185a76812f0 100644
--- a/nj2k/testData/newJ2k/nullability/MethodReturnsNullInAnonymousClass.kt
+++ b/nj2k/testData/newJ2k/nullability/MethodReturnsNullInAnonymousClass.kt
@@ -1,4 +1,3 @@
-// ERROR: Return type of 'get' is not a subtype of the return type of the overridden member 'public abstract fun get(): String defined in Getter'
 internal interface Getter {
     fun get(): String?
 }
diff --git a/nj2k/testData/newJ2k/nullability/notNullCast.kt b/nj2k/testData/newJ2k/nullability/notNullCast.kt
index 07f1a7d9b30..322fd4caaee 100644
--- a/nj2k/testData/newJ2k/nullability/notNullCast.kt
+++ b/nj2k/testData/newJ2k/nullability/notNullCast.kt
@@ -1,5 +1,3 @@
-// ERROR: Type mismatch: inferred type is Passenger.PassChild? but Passenger.PassChild was expected
-// ERROR: Type mismatch: inferred type is Passenger.PassChild? but Passenger.PassChild was expected
 class Passenger {
     open class PassParent
 
diff --git a/nj2k/testData/newJ2k/toArray/toArray.kt b/nj2k/testData/newJ2k/toArray/toArray.kt
index 34f4a8c76ae..c4e615cae33 100644
--- a/nj2k/testData/newJ2k/toArray/toArray.kt
+++ b/nj2k/testData/newJ2k/toArray/toArray.kt
@@ -1,3 +1,6 @@
+// ERROR: Type mismatch: inferred type is Any but String was expected
+// ERROR: Type mismatch: inferred type is Any but String was expected
+// ERROR: Type mismatch: inferred type is Array<String> but Array<Any> was expected
 import java.util.Arrays
 
 class Foo {
diff --git a/nj2k/tests/org/jetbrains/kotlin/nj2k/StructuralPsiCompare.kt b/nj2k/tests/org/jetbrains/kotlin/nj2k/StructuralPsiCompare.kt
index 4e6c655a2bf..c5b1ef1303a 100644
--- a/nj2k/tests/org/jetbrains/kotlin/nj2k/StructuralPsiCompare.kt
+++ b/nj2k/tests/org/jetbrains/kotlin/nj2k/StructuralPsiCompare.kt
@@ -5,13 +5,11 @@
 
 package org.jetbrains.kotlin.nj2k
 
-import com.intellij.psi.PsiComment
 import com.intellij.psi.PsiElement
 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()
@@ -23,9 +21,6 @@ internal fun KtFile.dumpStructureText(): String {
                 }
                 return
             }
-            if (element is PsiComment && (element.text.startsWith("// ERROR") || element.text.startsWith("// !"))) {
-                return
-            }
             if (element is LeafPsiElement) {
                 sb.append(element.text)
                 return