diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.kt b/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.kt
index 68ee7fed0af..fdefd42d9ba 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.kt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.kt
@@ -1,17 +1,5 @@
 // CORRECT_ERROR_TYPES
 
-// EXPECTED_ERROR(kotlin:18:1) cannot find symbol
-// EXPECTED_ERROR(kotlin:21:34) cannot find symbol
-// EXPECTED_ERROR(kotlin:21:50) cannot find symbol
-// EXPECTED_ERROR(kotlin:21:62) cannot find symbol
-// EXPECTED_ERROR(kotlin:23:1) cannot find symbol
-// EXPECTED_ERROR(kotlin:24:1) cannot find symbol
-// EXPECTED_ERROR(kotlin:28:5) cannot find symbol
-// EXPECTED_ERROR(kotlin:29:5) cannot find symbol
-// EXPECTED_ERROR(kotlin:32:5) cannot find symbol
-// EXPECTED_ERROR(kotlin:34:5) cannot find symbol
-// EXPECTED_ERROR(kotlin:37:5) cannot find symbol
-
 @file:Suppress("UNRESOLVED_REFERENCE", "ANNOTATION_ARGUMENT_MUST_BE_CONST", "NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION")
 import kotlin.reflect.KClass
 
@@ -37,4 +25,16 @@ class ErrorInDeclarations {
     fun f4(): ABC? = null
 }
 
-annotation class Anno(val a: KClass<Any>)
\ No newline at end of file
+annotation class Anno(val a: KClass<Any>)
+
+// EXPECTED_ERROR(kotlin:11:1) cannot find symbol
+// EXPECTED_ERROR(kotlin:12:1) cannot find symbol
+// EXPECTED_ERROR(kotlin:16:5) cannot find symbol
+// EXPECTED_ERROR(kotlin:17:5) cannot find symbol
+// EXPECTED_ERROR(kotlin:20:5) cannot find symbol
+// EXPECTED_ERROR(kotlin:22:5) cannot find symbol
+// EXPECTED_ERROR(kotlin:25:5) cannot find symbol
+// EXPECTED_ERROR(kotlin:6:1) cannot find symbol
+// EXPECTED_ERROR(kotlin:9:34) cannot find symbol
+// EXPECTED_ERROR(kotlin:9:50) cannot find symbol
+// EXPECTED_ERROR(kotlin:9:62) cannot find symbol
\ No newline at end of file
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/importsKt22083.kt b/plugins/kapt3/kapt3-compiler/testData/converter/importsKt22083.kt
index 05775aedd1c..9ab94d69099 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/importsKt22083.kt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/importsKt22083.kt
@@ -1,5 +1,4 @@
 // CORRECT_ERROR_TYPES
-// EXPECTED_ERROR(kotlin:17:5) cannot find symbol
 
 // FILE: a.kt
 package test
@@ -51,4 +50,6 @@ interface TestC {
     fun d(): LibIOException
 
     fun e(): LibFooBar
-}
\ No newline at end of file
+}
+
+// EXPECTED_ERROR(kotlin:17:5) cannot find symbol
\ No newline at end of file
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.kt b/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.kt
index d340bbc4ad1..8d632996be4 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.kt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/invalidFieldName.kt
@@ -1,9 +1,9 @@
-// EXPECTED_ERROR(kotlin:8:1) cannot find symbol
-// EXPECTED_ERROR(other:-1:-1) 'WHI-TE' is an invalid Java enum value name
-
 enum class Color {
     BLACK, `WHI-TE`
 }
 
 @Anno(Color.`WHI-TE`)
-annotation class Anno(val color: Color)
\ No newline at end of file
+annotation class Anno(val color: Color)
+
+// EXPECTED_ERROR(kotlin:5:1) cannot find symbol
+// EXPECTED_ERROR(other:-1:-1) 'WHI-TE' is an invalid Java enum value name
\ No newline at end of file
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt18791.kt b/plugins/kapt3/kapt3-compiler/testData/converter/kt18791.kt
index d058ae80e15..918be445690 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/kt18791.kt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt18791.kt
@@ -1,8 +1,3 @@
-// EXPECTED_ERROR class B is public, should be declared in a file named B.java
-// EXPECTED_ERROR class R is public, should be declared in a file named R.java
-// EXPECTED_ERROR class R is public, should be declared in a file named R.java
-// EXPECTED_ERROR class R2 is public, should be declared in a file named R2.java
-
 //FILE: lib/R.java
 package lib;
 
@@ -87,4 +82,9 @@ class MyActivity {
 
     @Bind(B.id.textView)
     fun plainIntConstant() {}
-}
\ No newline at end of file
+}
+
+// EXPECTED_ERROR class B is public, should be declared in a file named B.java
+// EXPECTED_ERROR class R is public, should be declared in a file named R.java
+// EXPECTED_ERROR class R is public, should be declared in a file named R.java
+// EXPECTED_ERROR class R2 is public, should be declared in a file named R2.java
\ No newline at end of file
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.kt b/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.kt
index 4eaecb6bf89..7acc5dacc56 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.kt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.kt
@@ -1,8 +1,5 @@
 // STRICT_MODE
 
-// EXPECTED_ERROR(kotlin:12:9) cannot find symbol
-// EXPECTED_ERROR(other:-1:-1) Can't generate a stub for 'Foo$Bar$Bar'.
-
 class Foo(private val string: String) {
     val bar = Bar("bar")
 
@@ -11,4 +8,7 @@ class Foo(private val string: String) {
 
         val bars: ArrayList<Bar> = ArrayList()
     }
-}
\ No newline at end of file
+}
+
+// EXPECTED_ERROR(kotlin:9:9) cannot find symbol
+// EXPECTED_ERROR(other:-1:-1) Can't generate a stub for 'Foo$Bar$Bar'.
\ No newline at end of file
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/maxErrorCount.kt b/plugins/kapt3/kapt3-compiler/testData/converter/maxErrorCount.kt
index 2e4ddf3bea1..1fae0c14e08 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/maxErrorCount.kt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/maxErrorCount.kt
@@ -1,5 +1,4 @@
 // CORRECT_ERROR_TYPES
-// EXPECTED_ERROR(kotlin:9:5) cannot find symbol
 // JAVAC_OPTION -Xmaxerrs=1
 
 @file:Suppress("UNRESOLVED_REFERENCE")
@@ -10,4 +9,6 @@ class Test {
 }
 
 // There are two errors (unresolved identifier ABC, BCD) actually.
-// But we specified the max error count, so the error output is limited.
\ No newline at end of file
+// But we specified the max error count, so the error output is limited.
+
+// EXPECTED_ERROR(kotlin:8:5) cannot find symbol
\ No newline at end of file
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.kt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.kt
index 7d453bed8ea..d46331ff225 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.kt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.kt
@@ -1,6 +1,3 @@
-// EXPECTED_ERROR class J$B is public, should be declared in a file named J$B.java
-// EXPECTED_ERROR class JavaClass is public, should be declared in a file named JavaClass.java
-
 // FILE: JavaClass.java
 public class JavaClass {
     public class Foo {
@@ -78,4 +75,7 @@ class `A$B` {
 class Test1(val zoo: Foo.Bar.Zoo) : Foo.Bar(), IFoo.IBar, IFoo.IBar.IZoo {
     fun a(): Thread.State = Thread.State.NEW
     fun b(foo: JavaClass.Foo, bar: JavaClass.Foo.Bar) {}
-}
\ No newline at end of file
+}
+
+// EXPECTED_ERROR class J$B is public, should be declared in a file named J$B.java
+// EXPECTED_ERROR class JavaClass is public, should be declared in a file named JavaClass.java
\ No newline at end of file
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.kt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.kt
index 14f1f33ed57..9029cac2375 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.kt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.kt
@@ -1,5 +1,3 @@
-// EXPECTED_ERROR class J$B is public, should be declared in a file named J$B.java
-
 // FILE: test/JavaClass.java
 package test;
 
@@ -83,4 +81,6 @@ class `A$B` {
 class Test1(val zoo: Foo.Bar.Zoo) : Foo.Bar(), IFoo.IBar, IFoo.IBar.IZoo {
     fun a(): Thread.State = Thread.State.NEW
     fun b(foo: JavaClass.Foo, bar: JavaClass.Foo.Bar) {}
-}
\ No newline at end of file
+}
+
+// EXPECTED_ERROR class J$B is public, should be declared in a file named J$B.java
\ No newline at end of file
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.kt b/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.kt
index ecb0c2c4090..a4a659099a1 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.kt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.kt
@@ -1,5 +1,3 @@
-// EXPECTED_ERROR(other:-1:-1) '60x60' is an invalid Java enum value name
-
 class `:)` {
     lateinit val f: String
 }
@@ -37,4 +35,6 @@ class `!A@`
 class `A()B()`
 class `A B` {
     class C
-}
\ No newline at end of file
+}
+
+// EXPECTED_ERROR(other:-1:-1) '60x60' is an invalid Java enum value name
\ No newline at end of file