diff --git a/compiler/testData/codegen/bytecodeText/inlineClasses/propertyAccessorsAreCalledByInlineClass.kt b/compiler/testData/codegen/bytecodeText/inlineClasses/propertyAccessorsAreCalledByInlineClass.kt
index 6e182314fbf..61063f05a0a 100644
--- a/compiler/testData/codegen/bytecodeText/inlineClasses/propertyAccessorsAreCalledByInlineClass.kt
+++ b/compiler/testData/codegen/bytecodeText/inlineClasses/propertyAccessorsAreCalledByInlineClass.kt
@@ -1,6 +1,7 @@
 // !LANGUAGE: +InlineClasses
 
 // FILE: Z.kt
+@Suppress("RESERVED_VAR_PROPERTY_OF_VALUE_CLASS")
 inline class Z(val x: Int) {
     val aVal: Int
         get() = x
diff --git a/compiler/testData/codegen/bytecodeText/mangling/parenthesesNoSanitize.kt b/compiler/testData/codegen/bytecodeText/mangling/parenthesesNoSanitize.kt
index 7e164d29c2f..757c699fa16 100644
--- a/compiler/testData/codegen/bytecodeText/mangling/parenthesesNoSanitize.kt
+++ b/compiler/testData/codegen/bytecodeText/mangling/parenthesesNoSanitize.kt
@@ -1,3 +1,4 @@
+// IGNORE_DEXING
 class `(X)` {
     fun `(Y)`() {}
 }
diff --git a/compiler/testData/codegen/bytecodeText/parameterlessMain/dontGenerateOnJvmOverloads.kt b/compiler/testData/codegen/bytecodeText/parameterlessMain/dontGenerateOnJvmOverloads.kt
index 54e43534fe1..68868536344 100644
--- a/compiler/testData/codegen/bytecodeText/parameterlessMain/dontGenerateOnJvmOverloads.kt
+++ b/compiler/testData/codegen/bytecodeText/parameterlessMain/dontGenerateOnJvmOverloads.kt
@@ -1,3 +1,4 @@
+// IGNORE_BACKEND: JVM
 fun main() {
   println("FAIL")
 }
diff --git a/compiler/testData/codegen/bytecodeText/statements/labeled.kt b/compiler/testData/codegen/bytecodeText/statements/labeled.kt
index e916024572a..e6d2ba1e488 100644
--- a/compiler/testData/codegen/bytecodeText/statements/labeled.kt
+++ b/compiler/testData/codegen/bytecodeText/statements/labeled.kt
@@ -1,3 +1,5 @@
+// IGNORE_BACKEND_FIR: JVM_IR
+
 fun main()
 {
     l@ if (2 != 1) "fail 3"
diff --git a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/whenOr.kt b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/whenOr.kt
index 7814ae5c799..c701b5c8f38 100644
--- a/compiler/testData/codegen/bytecodeText/whenEnumOptimization/whenOr.kt
+++ b/compiler/testData/codegen/bytecodeText/whenEnumOptimization/whenOr.kt
@@ -1,7 +1,7 @@
 // IGNORE_BACKEND: JVM
 
 fun test(x: Int): String {
-    when {
+    return when {
         x == 1 || x == 3 || x == 5 -> "135"
         x == 2 || x == 4 || x == 6 -> "246"
         else -> "other"
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeTextTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeTextTest.kt
index 291492e8a82..898ee7bcaf8 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeTextTest.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractBytecodeTextTest.kt
@@ -10,6 +10,8 @@ import org.jetbrains.kotlin.test.TargetBackend
 import org.jetbrains.kotlin.test.backend.BlackBoxCodegenSuppressor
 import org.jetbrains.kotlin.test.backend.classic.ClassicJvmBackendFacade
 import org.jetbrains.kotlin.test.backend.handlers.BytecodeTextHandler
+import org.jetbrains.kotlin.test.backend.handlers.NoCompilationErrorsHandler
+import org.jetbrains.kotlin.test.backend.handlers.NoFirCompilationErrorsHandler
 import org.jetbrains.kotlin.test.backend.ir.JvmIrBackendFacade
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
 import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives
@@ -42,6 +44,8 @@ abstract class AbstractBytecodeTextTestBase<R : ResultingArtifact.FrontendOutput
             +WITH_REFLECT
         }
 
+       commonHandlersForCodegenTest()
+
         useArtifactsHandlers(::BytecodeTextHandler)
 
         useAfterAnalysisCheckers(::BlackBoxCodegenSuppressor)
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractCompileKotlinAgainstInlineKotlinTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractCompileKotlinAgainstInlineKotlinTest.kt
index 0e0e8d7306c..f9cc7146c1c 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractCompileKotlinAgainstInlineKotlinTest.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractCompileKotlinAgainstInlineKotlinTest.kt
@@ -40,7 +40,7 @@ abstract class AbstractCompileKotlinAgainstInlineKotlinTestBase<I : ResultingArt
             backendFacade
         )
         useInlineHandlers()
-        commonHandlersForCodegenTest()
+        commonHandlersForBoxTest()
         useModuleStructureTransformers(
             ModuleTransformerForTwoFilesBoxTests()
         )
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractCompileKotlinAgainstKotlinWithDifferentBackendsTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractCompileKotlinAgainstKotlinWithDifferentBackendsTest.kt
index cef5e3616e3..401f237f20a 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractCompileKotlinAgainstKotlinWithDifferentBackendsTest.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractCompileKotlinAgainstKotlinWithDifferentBackendsTest.kt
@@ -19,7 +19,6 @@ import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2IrConverter
 import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade
 import org.jetbrains.kotlin.test.model.FrontendKinds
 import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerWithTargetBackendTest
-import org.jetbrains.kotlin.test.runners.codegen.commonConfigurationForCodegenTest
 import org.jetbrains.kotlin.test.services.ModuleTransformerForSwitchingBackend
 
 @OptIn(TestInfrastructureInternals::class)
@@ -37,7 +36,7 @@ abstract class AbstractJvmIrAgainstOldBoxTestBase(targetBackend: TargetBackend)
             ::ClassicJvmBackendFacade
         )
 
-        commonHandlersForCodegenTest()
+        commonHandlersForBoxTest()
 
         useFrontend2BackendConverters(::ClassicFrontend2IrConverter)
         useBackendFacades(::JvmIrBackendFacade)
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractJvmBlackBoxCodegenTestBase.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractJvmBlackBoxCodegenTestBase.kt
index cc4c397ae56..cf1c013ee67 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractJvmBlackBoxCodegenTestBase.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractJvmBlackBoxCodegenTestBase.kt
@@ -23,7 +23,7 @@ abstract class AbstractJvmBlackBoxCodegenTestBase<R : ResultingArtifact.Frontend
 
     override fun TestConfigurationBuilder.configuration() {
         commonConfigurationForCodegenTest(targetFrontend, frontendFacade, frontendToBackendConverter, backendFacade)
-        commonHandlersForCodegenTest()
+        commonHandlersForBoxTest()
         useArtifactsHandlers(::BytecodeListingHandler)
         useAfterAnalysisCheckers(::BlackBoxCodegenSuppressor)
     }
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractJvmIrAgainstOldBoxTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractJvmIrAgainstOldBoxTest.kt
index d79e7d7c668..27918a5c6a8 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractJvmIrAgainstOldBoxTest.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractJvmIrAgainstOldBoxTest.kt
@@ -37,7 +37,7 @@ open class AbstractBackendAgainstBackendBoxTestBase(
         useFrontend2BackendConverters(::ClassicFrontend2IrConverter)
         useBackendFacades(::JvmIrBackendFacade)
 
-        commonHandlersForCodegenTest()
+        commonHandlersForBoxTest()
         useInlineHandlers()
 
         useAfterAnalysisCheckers(::BlackBoxCodegenSuppressor.bind(CodegenTestDirectives.IGNORE_BACKEND_MULTI_MODULE))
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/BaseCodegenConfiguration.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/BaseCodegenConfiguration.kt
index f40dd562709..b4d9945af35 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/BaseCodegenConfiguration.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/BaseCodegenConfiguration.kt
@@ -11,7 +11,6 @@ import org.jetbrains.kotlin.test.backend.handlers.*
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
 import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.DUMP_SMAP
 import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.RUN_DEX_CHECKER
-import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.USE_PSI_CLASS_FILES_READING
 import org.jetbrains.kotlin.test.model.*
 import org.jetbrains.kotlin.test.services.configuration.CommonEnvironmentConfigurator
 import org.jetbrains.kotlin.test.services.configuration.JvmEnvironmentConfigurator
@@ -51,6 +50,13 @@ fun <R : ResultingArtifact.FrontendOutput<R>> TestConfigurationBuilder.commonCon
     useBackendFacades(backendFacade)
 }
 
+fun TestConfigurationBuilder.commonHandlersForBoxTest() {
+    commonHandlersForCodegenTest()
+    useArtifactsHandlers(
+        ::JvmBoxRunner
+    )
+}
+
 fun TestConfigurationBuilder.commonHandlersForCodegenTest() {
     useFrontendHandlers(
         ::NoCompilationErrorsHandler,
@@ -58,7 +64,6 @@ fun TestConfigurationBuilder.commonHandlersForCodegenTest() {
     )
 
     useArtifactsHandlers(
-        ::JvmBoxRunner,
         ::NoJvmSpecificCompilationErrorsHandler,
         ::DxCheckerHandler,
     )