diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractLocalVariableTestBase.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractLocalVariableTestBase.kt
index 29a0d74bd28..2ffa2de55d6 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractLocalVariableTestBase.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractLocalVariableTestBase.kt
@@ -9,9 +9,11 @@ import org.jetbrains.kotlin.test.Constructor
 import org.jetbrains.kotlin.test.TargetBackend
 import org.jetbrains.kotlin.test.backend.BlackBoxCodegenSuppressor
 import org.jetbrains.kotlin.test.backend.BlackBoxInlinerCodegenSuppressor
+import org.jetbrains.kotlin.test.backend.handlers.LocalVariableDebugRunner
 import org.jetbrains.kotlin.test.backend.ir.IrBackendInput
 import org.jetbrains.kotlin.test.backend.ir.JvmIrBackendFacade
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
+import org.jetbrains.kotlin.test.builders.configureJvmArtifactsHandlersStep
 import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.REQUIRES_SEPARATE_PROCESS
 import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.REPORT_ONLY_EXPLICITLY_DEFINED_DEBUG_INFO
 import org.jetbrains.kotlin.test.model.Frontend2BackendConverter
@@ -31,7 +33,10 @@ abstract class AbstractLocalVariableTestBase<R : ResultingArtifact.FrontendOutpu
             commonServicesConfigurationForDebugTest(it)
         }
 
-        configureCommonHandlersForLocalVariableTest()
+        commonHandlersForCodegenTest()
+        configureJvmArtifactsHandlersStep {
+            useHandlers(::LocalVariableDebugRunner)
+        }
 
         useAfterAnalysisCheckers(::BlackBoxCodegenSuppressor, ::BlackBoxInlinerCodegenSuppressor)
 
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractSteppingTestBase.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractSteppingTestBase.kt
index 0375faec059..969d8b74141 100644
--- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractSteppingTestBase.kt
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractSteppingTestBase.kt
@@ -9,9 +9,11 @@ import org.jetbrains.kotlin.test.Constructor
 import org.jetbrains.kotlin.test.TargetBackend
 import org.jetbrains.kotlin.test.backend.BlackBoxCodegenSuppressor
 import org.jetbrains.kotlin.test.backend.BlackBoxInlinerCodegenSuppressor
+import org.jetbrains.kotlin.test.backend.handlers.SteppingDebugRunner
 import org.jetbrains.kotlin.test.backend.ir.IrBackendInput
 import org.jetbrains.kotlin.test.backend.ir.JvmIrBackendFacade
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
+import org.jetbrains.kotlin.test.builders.configureJvmArtifactsHandlersStep
 import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.REQUIRES_SEPARATE_PROCESS
 import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.REPORT_ONLY_EXPLICITLY_DEFINED_DEBUG_INFO
 import org.jetbrains.kotlin.test.model.Frontend2BackendConverter
@@ -31,7 +33,10 @@ abstract class AbstractSteppingTestBase<R : ResultingArtifact.FrontendOutput<R>>
             commonServicesConfigurationForDebugTest(it)
         }
 
-        configureCommonHandlersForSteppingTest()
+        commonHandlersForCodegenTest()
+        configureJvmArtifactsHandlersStep {
+            useHandlers(::SteppingDebugRunner)
+        }
 
         useAfterAnalysisCheckers(::BlackBoxCodegenSuppressor, ::BlackBoxInlinerCodegenSuppressor)
 
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 62696d5f63d..1bc57a133ce 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
@@ -122,20 +122,6 @@ fun TestConfigurationBuilder.configureCommonHandlersForBoxTest() {
     }
 }
 
-fun TestConfigurationBuilder.configureCommonHandlersForSteppingTest() {
-    commonHandlersForCodegenTest()
-    configureJvmArtifactsHandlersStep {
-        steppingHandlersForBackendStep()
-    }
-}
-
-fun TestConfigurationBuilder.configureCommonHandlersForLocalVariableTest() {
-    commonHandlersForCodegenTest()
-    configureJvmArtifactsHandlersStep {
-        localVariableHandlersForBackendStep()
-    }
-}
-
 fun TestConfigurationBuilder.commonHandlersForCodegenTest() {
     configureClassicFrontendHandlersStep {
         commonClassicFrontendHandlersForCodegenTest()
@@ -168,14 +154,6 @@ fun HandlersStepBuilder<BinaryArtifacts.Jvm, ArtifactKinds.Jvm>.boxHandlersForBa
     )
 }
 
-fun HandlersStepBuilder<BinaryArtifacts.Jvm, ArtifactKinds.Jvm>.steppingHandlersForBackendStep() {
-    useHandlers(::SteppingDebugRunner)
-}
-
-fun HandlersStepBuilder<BinaryArtifacts.Jvm, ArtifactKinds.Jvm>.localVariableHandlersForBackendStep() {
-    useHandlers(::LocalVariableDebugRunner)
-}
-
 fun HandlersStepBuilder<ClassicFrontendOutputArtifact, FrontendKinds.ClassicFrontend>.commonClassicFrontendHandlersForCodegenTest() {
     useHandlers(
         ::NoCompilationErrorsHandler,