diff --git a/compiler/frontend.common/src/org/jetbrains/kotlin/diagnostics/DiagnosticReporterFactory.kt b/compiler/frontend.common/src/org/jetbrains/kotlin/diagnostics/DiagnosticReporterFactory.kt
index 4e149dfc5ebef..145142568f7a6 100644
--- a/compiler/frontend.common/src/org/jetbrains/kotlin/diagnostics/DiagnosticReporterFactory.kt
+++ b/compiler/frontend.common/src/org/jetbrains/kotlin/diagnostics/DiagnosticReporterFactory.kt
@@ -5,18 +5,12 @@
 
 package org.jetbrains.kotlin.diagnostics
 
-import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.diagnostics.impl.BaseDiagnosticsCollector
 import org.jetbrains.kotlin.diagnostics.impl.PendingDiagnosticsCollectorWithSuppress
 import org.jetbrains.kotlin.diagnostics.impl.SimpleDiagnosticsCollector
 import org.jetbrains.kotlin.diagnostics.impl.SimpleDiagnosticsCollectorWithSuppress
 
 object DiagnosticReporterFactory {
-    // kept only to keep compatibility with Compose tests
-    fun createReporter(messageCollector: MessageCollector): BaseDiagnosticsCollector {
-        return createReporter()
-    }
-
     fun createReporter(disableSuppress: Boolean = false): BaseDiagnosticsCollector {
         return if (disableSuppress) {
             SimpleDiagnosticsCollector()
diff --git a/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/utils/FirErrorsDefaultMessagesHelper.kt b/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/utils/FirErrorsDefaultMessagesHelper.kt
index fcb8a4135ece8..388adf193a018 100644
--- a/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/utils/FirErrorsDefaultMessagesHelper.kt
+++ b/compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/utils/FirErrorsDefaultMessagesHelper.kt
@@ -12,11 +12,11 @@ import org.junit.Assert
 import kotlin.reflect.KProperty
 import kotlin.reflect.full.memberProperties
 
-fun verifyDiagnostics(vararg rendererToContainerMap: Pair<KtDiagnosticFactoryToRendererMap, KtDiagnosticsContainer>) {
+fun verifyDiagnostics(vararg diagnosticContainers: KtDiagnosticsContainer) {
     val errors = mutableListOf<String>()
     val existingDiagnosticFactories = mutableMapOf<String, AbstractKtDiagnosticFactory>()
-    for ((renderer, container) in rendererToContainerMap) {
-        renderer.verifyMessages(container, errors, existingDiagnosticFactories)
+    for (container in diagnosticContainers) {
+        container.getRendererFactory().MAP.verifyMessages(container, errors, existingDiagnosticFactories)
     }
     if (errors.isNotEmpty()) {
         Assert.fail(
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DefaultDiagnosticsTest.kt b/compiler/tests/org/jetbrains/kotlin/checkers/DefaultDiagnosticsTest.kt
index a903f5486762e..36efbc3569fda 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DefaultDiagnosticsTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DefaultDiagnosticsTest.kt
@@ -7,20 +7,12 @@ package org.jetbrains.kotlin.checkers
 
 import org.jetbrains.kotlin.fir.analysis.diagnostics.CliDiagnostics
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
-import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrorsDefaultMessages
-import org.jetbrains.kotlin.fir.analysis.diagnostics.KtDiagnosticMessagesCli
 import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors
-import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrorsDefaultMessages
 import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors
-import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrorsDefaultMessages
 import org.jetbrains.kotlin.fir.analysis.diagnostics.native.FirNativeErrors
-import org.jetbrains.kotlin.fir.analysis.diagnostics.native.FirNativeErrorsDefaultMessages
 import org.jetbrains.kotlin.fir.analysis.diagnostics.wasm.FirWasmErrors
-import org.jetbrains.kotlin.fir.analysis.diagnostics.wasm.FirWasmErrorsDefaultMessages
 import org.jetbrains.kotlin.fir.analysis.diagnostics.web.common.FirWebCommonErrors
-import org.jetbrains.kotlin.fir.analysis.diagnostics.web.common.FirWebCommonErrorsDefaultMessages
 import org.jetbrains.kotlin.fir.builder.FirSyntaxErrors
-import org.jetbrains.kotlin.fir.builder.FirSyntaxErrorsDefaultMessages
 import org.jetbrains.kotlin.test.utils.verifyDiagnostics
 import org.junit.Test
 
@@ -28,14 +20,14 @@ class DefaultDiagnosticsTest {
     @Test
     fun verify() {
         verifyDiagnostics(
-            FirErrorsDefaultMessages.MAP to FirErrors,
-            FirJvmErrorsDefaultMessages.MAP to FirJvmErrors,
-            FirJsErrorsDefaultMessages.MAP to FirJsErrors,
-            FirNativeErrorsDefaultMessages.MAP to FirNativeErrors,
-            FirWasmErrorsDefaultMessages.MAP to FirWasmErrors,
-            FirWebCommonErrorsDefaultMessages.MAP to FirWebCommonErrors,
-            FirSyntaxErrorsDefaultMessages.MAP to FirSyntaxErrors,
-            KtDiagnosticMessagesCli.MAP to CliDiagnostics
+            FirErrors,
+            FirJvmErrors,
+            FirJsErrors,
+            FirNativeErrors,
+            FirWasmErrors,
+            FirWebCommonErrors,
+            FirSyntaxErrors,
+            CliDiagnostics
         )
     }
 }
diff --git a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/kotlin/androidx/compose/compiler/plugins/kotlin/facade/K2CompilerFacade.kt b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/kotlin/androidx/compose/compiler/plugins/kotlin/facade/K2CompilerFacade.kt
index a2c046bfe7d05..d5fa6e54c57dd 100644
--- a/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/kotlin/androidx/compose/compiler/plugins/kotlin/facade/K2CompilerFacade.kt
+++ b/plugins/compose/compiler-hosted/integration-tests/src/jvmTest/kotlin/androidx/compose/compiler/plugins/kotlin/facade/K2CompilerFacade.kt
@@ -165,8 +165,7 @@ class K2CompilerFacade(environment: KotlinCoreEnvironment) : KotlinCompilerFacad
         val commonKtFiles = commonFiles.map { it.toKtFile(project) }
         val platformKtFiles = platformFiles.map { it.toKtFile(project) }
 
-        val messageCollector = configuration.getNotNull(CommonConfigurationKeys.MESSAGE_COLLECTOR_KEY)
-        val reporter = DiagnosticReporterFactory.createReporter(messageCollector)
+        val reporter = DiagnosticReporterFactory.createReporter()
         val commonAnalysis =
             buildResolveAndCheckFirFromKtFiles(commonSession, commonKtFiles, reporter)
         val platformAnalysis =
diff --git a/plugins/lombok/tests/org/jetbrains/kotlin/lombok/LombokDiagnosticsTest.kt b/plugins/lombok/tests/org/jetbrains/kotlin/lombok/LombokDiagnosticsTest.kt
index 5bbf838092258..8620fa38c5076 100644
--- a/plugins/lombok/tests/org/jetbrains/kotlin/lombok/LombokDiagnosticsTest.kt
+++ b/plugins/lombok/tests/org/jetbrains/kotlin/lombok/LombokDiagnosticsTest.kt
@@ -13,6 +13,6 @@ import org.junit.jupiter.api.Test
 class LombokDiagnosticsTest {
     @Test
     fun verify() {
-        verifyDiagnostics(KtDiagnosticMessagesLombok.MAP to LombokDiagnostics)
+        verifyDiagnostics(LombokDiagnostics)
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeDiagnosticsTest.kt b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeDiagnosticsTest.kt
index 989e346abe844..232335844f34c 100644
--- a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeDiagnosticsTest.kt
+++ b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/ParcelizeDiagnosticsTest.kt
@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.parcelize.test
 
-import org.jetbrains.kotlin.parcelize.fir.diagnostics.KtDefaultErrorMessagesParcelize
 import org.jetbrains.kotlin.parcelize.fir.diagnostics.KtErrorsParcelize
 import org.jetbrains.kotlin.test.utils.verifyDiagnostics
 import org.junit.jupiter.api.Test
@@ -13,6 +12,6 @@ import org.junit.jupiter.api.Test
 class ParcelizeDiagnosticsTest {
     @Test
     fun verify() {
-        verifyDiagnostics(KtDefaultErrorMessagesParcelize.MAP to KtErrorsParcelize)
+        verifyDiagnostics(KtErrorsParcelize)
     }
 }