diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/JsBackendDiagnosticsHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/KlibBackendDiagnosticsHandler.kt
similarity index 86%
rename from compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/JsBackendDiagnosticsHandler.kt
rename to compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/KlibBackendDiagnosticsHandler.kt
index 51686264946..da9c5011cb2 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/JsBackendDiagnosticsHandler.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/KlibBackendDiagnosticsHandler.kt
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.test.model.BinaryArtifacts
 import org.jetbrains.kotlin.test.model.TestModule
 import org.jetbrains.kotlin.test.services.TestServices
 
-class JsBackendDiagnosticsHandler(testServices: TestServices) : KlibArtifactHandler(testServices) {
+class KlibBackendDiagnosticsHandler(testServices: TestServices) : KlibArtifactHandler(testServices) {
     override fun processModule(module: TestModule, info: BinaryArtifacts.KLib) {
         reportKtDiagnostics(module, info.reporter)
     }
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractFirPsiJsDiagnosticTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractFirPsiJsDiagnosticTest.kt
index 8deca9193b3..c0460ea0ba6 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractFirPsiJsDiagnosticTest.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractFirPsiJsDiagnosticTest.kt
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.platform.js.JsPlatforms
 import org.jetbrains.kotlin.test.FirParser
 import org.jetbrains.kotlin.test.TargetBackend
 import org.jetbrains.kotlin.test.backend.BlackBoxCodegenSuppressor
-import org.jetbrains.kotlin.test.backend.handlers.JsBackendDiagnosticsHandler
+import org.jetbrains.kotlin.test.backend.handlers.KlibBackendDiagnosticsHandler
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
 import org.jetbrains.kotlin.test.builders.firHandlersStep
 import org.jetbrains.kotlin.test.builders.klibArtifactsHandlersStep
@@ -94,7 +94,7 @@ abstract class AbstractFirJsDiagnosticWithBackendTestBase(parser: FirParser) : A
         // facadeStep { JsIrBackendFacade(it, firstTimeCompilation = true) }
 
         klibArtifactsHandlersStep {
-            useHandlers(::JsBackendDiagnosticsHandler)
+            useHandlers(::KlibBackendDiagnosticsHandler)
         }
     }
 }
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractDiagnosticsTestWithJsStdLib.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractDiagnosticsTestWithJsStdLib.kt
index 258c0ab6e00..a2cc303a5c5 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractDiagnosticsTestWithJsStdLib.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractDiagnosticsTestWithJsStdLib.kt
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.js.test.converters.JsKlibBackendFacade
 import org.jetbrains.kotlin.platform.js.JsPlatforms
 import org.jetbrains.kotlin.test.TargetBackend
 import org.jetbrains.kotlin.test.backend.BlackBoxCodegenSuppressor
-import org.jetbrains.kotlin.test.backend.handlers.JsBackendDiagnosticsHandler
+import org.jetbrains.kotlin.test.backend.handlers.KlibBackendDiagnosticsHandler
 import org.jetbrains.kotlin.test.builders.*
 import org.jetbrains.kotlin.test.directives.ConfigurationDirectives
 import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives
@@ -84,7 +84,7 @@ abstract class AbstractDiagnosticsTestWithJsStdLibWithBackend : AbstractDiagnost
         // facadeStep { JsIrBackendFacade(it, firstTimeCompilation = true) }
 
         klibArtifactsHandlersStep {
-            useHandlers(::JsBackendDiagnosticsHandler)
+            useHandlers(::KlibBackendDiagnosticsHandler)
         }
     }
 }
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsBlackBoxCodegenTestBase.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsBlackBoxCodegenTestBase.kt
index 5a47c57c65e..b64d43c7f96 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsBlackBoxCodegenTestBase.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsBlackBoxCodegenTestBase.kt
@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.test.TargetBackend
 import org.jetbrains.kotlin.test.backend.BlackBoxCodegenSuppressor
 import org.jetbrains.kotlin.test.backend.handlers.IrMangledNameAndSignatureDumpHandler
 import org.jetbrains.kotlin.test.backend.handlers.JsIrInterpreterDumpHandler
-import org.jetbrains.kotlin.test.backend.handlers.JsBackendDiagnosticsHandler
+import org.jetbrains.kotlin.test.backend.handlers.KlibBackendDiagnosticsHandler
 import org.jetbrains.kotlin.test.backend.handlers.KlibInterpreterDumpHandler
 import org.jetbrains.kotlin.test.builders.*
 import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives
@@ -166,6 +166,6 @@ fun <
 
     facadeStep(backendFacade)
     klibArtifactsHandlersStep {
-        useHandlers(::JsBackendDiagnosticsHandler)
+        useHandlers(::KlibBackendDiagnosticsHandler)
     }
 }