diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalCompilerRunnerTestBase.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalCompilerRunnerTestBase.kt
index 9bf66ec2da5..e90ed42bd39 100644
--- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalCompilerRunnerTestBase.kt
+++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalCompilerRunnerTestBase.kt
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
 import org.jetbrains.kotlin.cli.common.arguments.parseCommandLineArguments
 import org.jetbrains.kotlin.incremental.testingUtils.*
 import org.jetbrains.kotlin.incremental.utils.TestCompilationResult
+import org.jetbrains.kotlin.test.InTextDirectivesUtils
 import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase
 import org.junit.Assert
 import java.io.File
@@ -79,6 +80,11 @@ abstract class AbstractIncrementalCompilerRunnerTestBase<Args : CommonCompilerAr
         fun Iterable<File>.relativePaths() =
             map { it.relativeTo(workingDir).path.replace('\\', '/') }
 
+        val reportInternalCompilerErrors =
+            File(testDir, InTextDirectivesUtils.DIRECTIVES_FILE_NAME).takeIf { it.exists() && it.isFile }?.let {
+                InTextDirectivesUtils.isDirectiveDefined(it.readText(), "// HIDE_INTERNAL_COMPILER_ERRORS")
+            } != true
+
         val srcDir = File(workingDir, "src").apply { mkdirs() }
         val cacheDir = File(workingDir, "incremental-data").apply { mkdirs() }
         val outDir = File(workingDir, "out").apply { mkdirs() }
@@ -140,7 +146,12 @@ abstract class AbstractIncrementalCompilerRunnerTestBase<Args : CommonCompilerAr
                 )
             )
             actualSB.appendLine(stepLogAsString(step, compiledSources.relativePaths(), compileErrors))
-            actualSBWithoutErrors.appendLine(stepLogAsString(step, compiledSources.relativePaths(), compileErrors, includeErrors = false))
+            actualSBWithoutErrors.appendLine(
+                stepLogAsString(
+                    step, compiledSources.relativePaths(), compileErrors,
+                    includeErrors = reportInternalCompilerErrors && (lastExitCode == ExitCode.INTERNAL_ERROR)
+                )
+            )
             step++
         }
 
diff --git a/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/InTextDirectivesUtils.java b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/InTextDirectivesUtils.java
index 6129cfca44b..567d0d4d32e 100644
--- a/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/InTextDirectivesUtils.java
+++ b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/InTextDirectivesUtils.java
@@ -23,7 +23,7 @@ import java.util.stream.Collectors;
 
 public final class InTextDirectivesUtils {
 
-    private static final String DIRECTIVES_FILE_NAME = "directives.txt";
+    public static final String DIRECTIVES_FILE_NAME = "directives.txt";
 
     public static final String IGNORE_BACKEND_DIRECTIVE_PREFIX = "// IGNORE_BACKEND: ";
     public static final String IGNORE_BACKEND_K1_DIRECTIVE_PREFIX = "// IGNORE_BACKEND_K1: ";
diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/directives.txt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/directives.txt
new file mode 100644
index 00000000000..3941f7abc90
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/directives.txt
@@ -0,0 +1 @@
+// HIDE_INTERNAL_COMPILER_ERRORS
diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/directives.txt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/directives.txt
new file mode 100644
index 00000000000..3941f7abc90
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/directives.txt
@@ -0,0 +1 @@
+// HIDE_INTERNAL_COMPILER_ERRORS
diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/directives.txt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/directives.txt
new file mode 100644
index 00000000000..3941f7abc90
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/directives.txt
@@ -0,0 +1 @@
+// HIDE_INTERNAL_COMPILER_ERRORS
diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/directives.txt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/directives.txt
new file mode 100644
index 00000000000..3941f7abc90
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/directives.txt
@@ -0,0 +1 @@
+// HIDE_INTERNAL_COMPILER_ERRORS
diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/directives.txt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/directives.txt
new file mode 100644
index 00000000000..3941f7abc90
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/directives.txt
@@ -0,0 +1 @@
+// HIDE_INTERNAL_COMPILER_ERRORS
diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/directives.txt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/directives.txt
new file mode 100644
index 00000000000..3941f7abc90
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/directives.txt
@@ -0,0 +1 @@
+// HIDE_INTERNAL_COMPILER_ERRORS
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/directives.txt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/directives.txt
new file mode 100644
index 00000000000..3941f7abc90
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/directives.txt
@@ -0,0 +1 @@
+// HIDE_INTERNAL_COMPILER_ERRORS