diff --git a/compiler/testData/debug/stepping/IfTrueThenFalse.kt b/compiler/testData/debug/stepping/IfTrueThenFalse.kt
index 58e8d42853d..a2e0b315e1a 100644
--- a/compiler/testData/debug/stepping/IfTrueThenFalse.kt
+++ b/compiler/testData/debug/stepping/IfTrueThenFalse.kt
@@ -9,8 +9,8 @@ fun box() {
 }
 
 // LINENUMBERS
-// TestKt.box():5
-// TestKt.cond():2
-// TestKt.box():5
-// TestKt.box():8
-// TestKt.box():9
+// test.kt:5
+// test.kt:2
+// test.kt:5
+// test.kt:8
+// test.kt:9
diff --git a/compiler/testData/debug/stepping/callableReference.kt b/compiler/testData/debug/stepping/callableReference.kt
index 1285100c185..37754ad2aa5 100644
--- a/compiler/testData/debug/stepping/callableReference.kt
+++ b/compiler/testData/debug/stepping/callableReference.kt
@@ -11,13 +11,13 @@ fun f(block: () -> Unit) {
 }
 
 // LINENUMBERS
-// TestKt.box():3
-// TestKt.box():4
-// TestKt.f(kotlin.jvm.functions.Function0):10
-// TestKt$box$1.invoke():5
-// TestKt$box$1.invoke():6
-// TestKt$box$1.invoke():-1
-// TestKt$box$1.invoke():-1
-// TestKt.f(kotlin.jvm.functions.Function0):10
-// TestKt.f(kotlin.jvm.functions.Function0):11
-// TestKt.box():7
+// test.kt:3
+// test.kt:4
+// test.kt:10
+// test.kt:5
+// test.kt:6
+// test.kt:-1
+// test.kt:-1
+// test.kt:10
+// test.kt:11
+// test.kt:7
diff --git a/compiler/testData/debug/stepping/conjunction.kt b/compiler/testData/debug/stepping/conjunction.kt
index 76ed1354031..a6b802ac3f8 100644
--- a/compiler/testData/debug/stepping/conjunction.kt
+++ b/compiler/testData/debug/stepping/conjunction.kt
@@ -19,15 +19,15 @@ fun getC() = false
 fun getD() = true
 
 // LINENUMBERS
-// TestKt.box():3
-// TestKt.getA():13
-// TestKt.box():3
-// TestKt.box():4
-// TestKt.getB():15
-// TestKt.box():4
-// TestKt.box():5
-// TestKt.getC():17
-// TestKt.box():5
-// TestKt.box():9
-// TestKt.box():3
-// TestKt.box():11
+// test.kt:3
+// test.kt:13
+// test.kt:3
+// test.kt:4
+// test.kt:15
+// test.kt:4
+// test.kt:5
+// test.kt:17
+// test.kt:5
+// test.kt:9
+// test.kt:3
+// test.kt:11
diff --git a/compiler/testData/debug/stepping/for.kt b/compiler/testData/debug/stepping/for.kt
index e57500da511..51edf4015cb 100644
--- a/compiler/testData/debug/stepping/for.kt
+++ b/compiler/testData/debug/stepping/for.kt
@@ -8,14 +8,14 @@ fun box() {
 inline fun foo(n: Int) {}
 
 // LINENUMBERS
-// TestKt.box():3
-// TestKt.box():4
-// TestKt.box():8
-// TestKt.box():3
-// TestKt.box():4
-// TestKt.box():8
-// TestKt.box():3
-// TestKt.box():4
-// TestKt.box():8
-// TestKt.box():3
-// TestKt.box():6
\ No newline at end of file
+// test.kt:3
+// test.kt:4
+// test.kt:8
+// test.kt:3
+// test.kt:4
+// test.kt:8
+// test.kt:3
+// test.kt:4
+// test.kt:8
+// test.kt:3
+// test.kt:6
\ No newline at end of file
diff --git a/compiler/testData/debug/stepping/functionInAnotherFile.kt b/compiler/testData/debug/stepping/functionInAnotherFile.kt
index f5ab4b559da..9ca45ccbb40 100644
--- a/compiler/testData/debug/stepping/functionInAnotherFile.kt
+++ b/compiler/testData/debug/stepping/functionInAnotherFile.kt
@@ -21,15 +21,15 @@ fun bar(x: Int) =
     }
 
 // LINENUMBERS
-// TestKt.box():4
-// FooKt.foo(int):4
-// FooKt.foo(int):7
-// TestKt.bar(int):8
-// TestKt.bar(int):9
-// FooKt.foo(int):4
-// FooKt.foo(int):5
-// TestKt.bar(int):9
-// TestKt.bar(int):12
-// FooKt.foo(int):7
-// TestKt.box():4
-// TestKt.box():5
+// test.kt:4
+// foo.kt:4
+// foo.kt:7
+// test.kt:8
+// test.kt:9
+// foo.kt:4
+// foo.kt:5
+// test.kt:9
+// test.kt:12
+// foo.kt:7
+// test.kt:4
+// test.kt:5
diff --git a/compiler/testData/debug/stepping/if.kt b/compiler/testData/debug/stepping/if.kt
index a82f2377b3c..c666cba45b7 100644
--- a/compiler/testData/debug/stepping/if.kt
+++ b/compiler/testData/debug/stepping/if.kt
@@ -14,11 +14,11 @@ inline fun getB(): Int {
 }
 
 // LINENUMBERS
-// TestKt.box():4
-// TestKt.box():13
-// TestKt.box():5
-// TestKt.getA():10
-// TestKt.box():5
-// TestKt.box():7
-// TestKt.box():13
-// TestKt.box():7
+// test.kt:4
+// test.kt:13
+// test.kt:5
+// test.kt:10
+// test.kt:5
+// test.kt:7
+// test.kt:13
+// test.kt:7
diff --git a/compiler/testData/debug/stepping/inlineCallableReference.kt b/compiler/testData/debug/stepping/inlineCallableReference.kt
index 63eb22b1731..cd10c5fe967 100644
--- a/compiler/testData/debug/stepping/inlineCallableReference.kt
+++ b/compiler/testData/debug/stepping/inlineCallableReference.kt
@@ -11,10 +11,10 @@ inline fun f(block: () -> Unit) {
 }
 
 // LINENUMBERS
-// TestKt.box():3
-// TestKt.box():4
-// TestKt.box():10
-// TestKt.box():5
-// TestKt.box():6
-// TestKt.box():11
-// TestKt.box():7
+// test.kt:3
+// test.kt:4
+// test.kt:10
+// test.kt:5
+// test.kt:6
+// test.kt:11
+// test.kt:7
diff --git a/compiler/testData/debug/stepping/inlineNamedCallableReference.kt b/compiler/testData/debug/stepping/inlineNamedCallableReference.kt
index 7cc78cbfe3e..e792dc4812f 100644
--- a/compiler/testData/debug/stepping/inlineNamedCallableReference.kt
+++ b/compiler/testData/debug/stepping/inlineNamedCallableReference.kt
@@ -11,10 +11,10 @@ inline fun f(block: () -> Unit) {
 fun g() {}
 
 // LINENUMBERS
-// TestKt.box():3
-// TestKt.box():4
-// TestKt.box():8
-// TestKt.box():4
-// TestKt.g():11
-// TestKt.box():9
-// TestKt.box():5
+// test.kt:3
+// test.kt:4
+// test.kt:8
+// test.kt:4
+// test.kt:11
+// test.kt:9
+// test.kt:5
diff --git a/compiler/testData/debug/stepping/namedCallableReference.kt b/compiler/testData/debug/stepping/namedCallableReference.kt
index 62b4f4a12cc..b5e586923e5 100644
--- a/compiler/testData/debug/stepping/namedCallableReference.kt
+++ b/compiler/testData/debug/stepping/namedCallableReference.kt
@@ -11,13 +11,13 @@ fun f(block: () -> Unit) {
 fun g() {}
 
 // LINENUMBERS
-// TestKt.box():3
-// TestKt.box():4
-// TestKt.f(kotlin.jvm.functions.Function0):8
-// TestKt.g():11
-// TestKt$box$1.invoke():4
-// TestKt$box$1.invoke():-1
-// TestKt$box$1.invoke():-1
-// TestKt.f(kotlin.jvm.functions.Function0):8
-// TestKt.f(kotlin.jvm.functions.Function0):9
-// TestKt.box():5
+// test.kt:3
+// test.kt:4
+// test.kt:8
+// test.kt:11
+// test.kt:4
+// test.kt:-1
+// test.kt:-1
+// test.kt:8
+// test.kt:9
+// test.kt:5
diff --git a/compiler/testData/debug/stepping/nestedInline.kt b/compiler/testData/debug/stepping/nestedInline.kt
index 628d7d65357..1e97720fd45 100644
--- a/compiler/testData/debug/stepping/nestedInline.kt
+++ b/compiler/testData/debug/stepping/nestedInline.kt
@@ -42,22 +42,22 @@ inline fun html(init: () -> Unit) {
 }
 
 // LINENUMBERS
-// TestKt.box():19
-// TestKt.box():7
-// TestKt.box():9
-// TestKt.box():18
-// TestKt.box():6
-// TestKt.box():10
-// TestKt.box():14
-// TestKt.box():10
-// TestKt.box():11
-// TestKt.box():11
-// TestKt.box():12
-// TestKt.box():12
-// TestKt.box():14
-// TestKt.box():13
-// TestKt.box():7
-// TestKt.box():18
-// TestKt.box():15
-// TestKt.box():19
-// TestKt.box():21
\ No newline at end of file
+// test.kt:19
+// test.kt:7
+// test.kt:9
+// 1.kt:18
+// 1.kt:6
+// test.kt:10
+// 1.kt:14
+// 1.kt:10
+// 1.kt:11
+// test.kt:11
+// test.kt:12
+// 1.kt:12
+// 1.kt:14
+// test.kt:13
+// 1.kt:7
+// 1.kt:18
+// test.kt:15
+// test.kt:19
+// test.kt:21
\ No newline at end of file
diff --git a/compiler/testData/debug/stepping/recursion.kt b/compiler/testData/debug/stepping/recursion.kt
index c26f2275684..7770f30989a 100644
--- a/compiler/testData/debug/stepping/recursion.kt
+++ b/compiler/testData/debug/stepping/recursion.kt
@@ -12,15 +12,15 @@ fun foo(n :Int ) : Int {
 }
 
 // LINENUMBERS
-// TestKt.box():3
-// TestKt.box():4
-// TestKt.foo(int):8
-// TestKt.foo(int):11
-// TestKt.foo(int):8
-// TestKt.foo(int):11
-// TestKt.foo(int):8
-// TestKt.foo(int):9
-// TestKt.foo(int):11
-// TestKt.foo(int):11
-// TestKt.box():4
-// TestKt.box():5
+// test.kt:3
+// test.kt:4
+// test.kt:8
+// test.kt:11
+// test.kt:8
+// test.kt:11
+// test.kt:8
+// test.kt:9
+// test.kt:11
+// test.kt:11
+// test.kt:4
+// test.kt:5
diff --git a/compiler/testData/debug/stepping/throwException.kt b/compiler/testData/debug/stepping/throwException.kt
index ad7ec1dadda..3e116d64efd 100644
--- a/compiler/testData/debug/stepping/throwException.kt
+++ b/compiler/testData/debug/stepping/throwException.kt
@@ -15,13 +15,13 @@ fun throwIfLess(a: Int, b: Int) {
         throw java.lang.IllegalStateException()
 }
 // LINENUMBERS
-// TestKt.box():3
-// TestKt.box():4
-// TestKt.box():5
-// TestKt.box():6
-// TestKt.throwIfLess(int, int):14
-// TestKt.throwIfLess(int, int):15
-// TestKt.box():7
-// TestKt.box():8
-// TestKt.throwIfLess(int, int):14
-// TestKt.throwIfLess(int, int):15
+// test.kt:3
+// test.kt:4
+// test.kt:5
+// test.kt:6
+// test.kt:14
+// test.kt:15
+// test.kt:7
+// test.kt:8
+// test.kt:14
+// test.kt:15
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/debugInformation/AbstractSteppingTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/debugInformation/AbstractSteppingTest.kt
index a43255ef502..389dacb9166 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/debugInformation/AbstractSteppingTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/debugInformation/AbstractSteppingTest.kt
@@ -56,7 +56,8 @@ abstract class AbstractSteppingTest : AbstractDebugTest() {
             .joinToString("\n")
         val actualLineNumbers = loggedItems
             .map { event ->
-                "${(event as LocatableEvent).location().method()}:${event.location().lineNumber()}"
+                val location = (event as LocatableEvent).location()
+                "${location.sourceName()}:${location.lineNumber()}"
             }
         TestCase.assertEquals(expectedLineNumbers, actualLineNumbers.joinToString("\n"))
     }