diff --git a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/AbstractVisualizerTest.kt b/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/AbstractVisualizerTest.kt
index 4eff5642582..6df6863cc42 100644
--- a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/AbstractVisualizerTest.kt
+++ b/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/AbstractVisualizerTest.kt
@@ -9,8 +9,9 @@ import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
 import org.jetbrains.kotlin.test.Constructor
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
 import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives
+import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade
+import org.jetbrains.kotlin.test.frontend.fir.FirFrontendFacade
 import org.jetbrains.kotlin.test.model.DependencyKind
-import org.jetbrains.kotlin.test.model.FrontendFacade
 import org.jetbrains.kotlin.test.model.FrontendKind
 import org.jetbrains.kotlin.test.model.FrontendOutputHandler
 import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerTest
@@ -20,7 +21,6 @@ import org.jetbrains.kotlin.test.services.configuration.JvmEnvironmentConfigurat
 abstract class AbstractVisualizerTest : AbstractKotlinCompilerTest() {
     abstract val handler: Constructor<FrontendOutputHandler<*>>
     abstract val frontendKind: FrontendKind<*>
-    abstract val frontendFacade: Constructor<FrontendFacade<*>>
 
     override fun TestConfigurationBuilder.configuration() {
         globalDefaults {
@@ -33,7 +33,10 @@ abstract class AbstractVisualizerTest : AbstractKotlinCompilerTest() {
             ::CommonEnvironmentConfigurator,
             ::JvmEnvironmentConfigurator,
         )
-        useFrontendFacades(frontendFacade)
+        useFrontendFacades(
+            ::FirFrontendFacade,
+            ::ClassicFrontendFacade
+        )
         useFrontendHandlers(handler)
 
         defaultDirectives {
diff --git a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/fir/AbstractFirVisualizerTest.kt b/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/fir/AbstractFirVisualizerTest.kt
index 4056e3640cc..d67615dbcc8 100644
--- a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/fir/AbstractFirVisualizerTest.kt
+++ b/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/fir/AbstractFirVisualizerTest.kt
@@ -12,7 +12,5 @@ import org.jetbrains.kotlin.visualizer.AbstractVisualizerTest
 
 abstract class AbstractFirVisualizerTest : AbstractVisualizerTest() {
     override val frontendKind: FrontendKind<*> = FrontendKinds.FIR
-    override val frontendFacade: Constructor<FrontendFacade<*>> = ::FirFrontendFacade
     override val handler: Constructor<FrontendOutputHandler<*>> = ::FirOutputHandler
-
 }
diff --git a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/fir/FirOutputHandler.kt b/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/fir/FirOutputHandler.kt
index 6f04d0e78f7..0eed7ff0ce3 100644
--- a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/fir/FirOutputHandler.kt
+++ b/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/fir/FirOutputHandler.kt
@@ -15,8 +15,8 @@ import java.io.File
 
 internal class FirOutputHandler(testServices: TestServices) : FirAnalysisHandler(testServices) {
     override fun processModule(module: TestModule, info: FirOutputArtifact) {
-        val renderer = FirVisualizer(info.firFiles.values.first())
-        val firRenderResult = renderer.render()
+        val renderer = info.firFiles.values.firstOrNull()?.let { FirVisualizer(it) } ?: return
+        val firRenderResult = renderer.render().trim()
 
         val replaceFrom = module.directives[VisualizerDirectives.TEST_FILE_PATH].first()
         val replaceTo = module.directives[VisualizerDirectives.EXPECTED_FILE_PATH].first()
diff --git a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/psi/AbstractPsiVisualizerTest.kt b/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/psi/AbstractPsiVisualizerTest.kt
index e0334f6f0b6..dad63fce431 100644
--- a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/psi/AbstractPsiVisualizerTest.kt
+++ b/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/psi/AbstractPsiVisualizerTest.kt
@@ -12,6 +12,5 @@ import org.jetbrains.kotlin.visualizer.AbstractVisualizerTest
 
 abstract class AbstractPsiVisualizerTest : AbstractVisualizerTest() {
     override val frontendKind: FrontendKind<*> = FrontendKinds.ClassicFrontend
-    override val frontendFacade: Constructor<FrontendFacade<*>> = ::ClassicFrontendFacade
     override val handler: Constructor<FrontendOutputHandler<*>> = ::PsiOutputHandler
 }
diff --git a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/psi/PsiOutputHandler.kt b/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/psi/PsiOutputHandler.kt
index 8b343dcfd36..d3784d831a9 100644
--- a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/psi/PsiOutputHandler.kt
+++ b/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/psi/PsiOutputHandler.kt
@@ -15,7 +15,7 @@ import java.io.File
 
 internal class PsiOutputHandler(testServices: TestServices) : ClassicFrontendAnalysisHandler(testServices) {
     override fun processModule(module: TestModule, info: ClassicFrontendOutputArtifact) {
-        val renderer = PsiVisualizer(info.ktFiles.values.first(), info.analysisResult)
+        val renderer = info.ktFiles.values.firstOrNull()?.let { PsiVisualizer(it, info.analysisResult) } ?: return
         val psiRenderResult = renderer.render()
 
         val replaceFrom = module.directives[VisualizerDirectives.TEST_FILE_PATH].first()