diff --git a/idea/testData/debugger/tinyApp/outs/stopInAnonymousFunctionInInlinedCallWithCrossInline.out b/idea/testData/debugger/tinyApp/outs/stopInAnonymousFunctionInInlinedCallWithCrossInline.out
new file mode 100644
index 00000000000..4eb9cea316c
--- /dev/null
+++ b/idea/testData/debugger/tinyApp/outs/stopInAnonymousFunctionInInlinedCallWithCrossInline.out
@@ -0,0 +1,8 @@
+LineBreakpoint created at stopInAnonymousFunctionInInlinedCallWithCrossInline.kt:8
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInAnonymousFunctionInInlinedCallWithCrossInline.StopInAnonymousFunctionInInlinedCallWithCrossInlineKt
+Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+stopInAnonymousFunctionInInlinedCallWithCrossInline.kt:8
+stopInAnonymousFunctionInInlinedCallWithCrossInline.kt:19
+Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+
+Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInAnonymousFunctionInInlinedCallWithCrossInlineDex.out b/idea/testData/debugger/tinyApp/outs/stopInAnonymousFunctionInInlinedCallWithCrossInlineDex.out
new file mode 100644
index 00000000000..5005a892e6b
--- /dev/null
+++ b/idea/testData/debugger/tinyApp/outs/stopInAnonymousFunctionInInlinedCallWithCrossInlineDex.out
@@ -0,0 +1,8 @@
+LineBreakpoint created at stopInAnonymousFunctionInInlinedCallWithCrossInlineDex.kt:8
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInAnonymousFunctionInInlinedCallWithCrossInlineDex.StopInAnonymousFunctionInInlinedCallWithCrossInlineDexKt
+Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+stopInAnonymousFunctionInInlinedCallWithCrossInlineDex.kt:8
+stopInAnonymousFunctionInInlinedCallWithCrossInlineDex.kt:19
+Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+
+Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/outs/stopInLambdaInInlinedCallWithCrossInline.out b/idea/testData/debugger/tinyApp/outs/stopInLambdaInInlinedCallWithCrossInline.out
index 1c9ab523a30..9e86bbbb820 100644
--- a/idea/testData/debugger/tinyApp/outs/stopInLambdaInInlinedCallWithCrossInline.out
+++ b/idea/testData/debugger/tinyApp/outs/stopInLambdaInInlinedCallWithCrossInline.out
@@ -2,7 +2,7 @@ LineBreakpoint created at stopInLambdaInInlinedCallWithCrossInline.kt:8
 !JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stopInLambdaInInlinedCallWithCrossInline.StopInLambdaInInlinedCallWithCrossInlineKt
 Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 stopInLambdaInInlinedCallWithCrossInline.kt:8
-stopInLambdaInInlinedCallWithCrossInline.kt:18
+stopInLambdaInInlinedCallWithCrossInline.kt:19
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
 
 Process finished with exit code 0
diff --git a/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInAnonymousFunctionInInlinedCallWithCrossInline.kt b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInAnonymousFunctionInInlinedCallWithCrossInline.kt
index e139e1cd0c4..ed76596e7c9 100644
--- a/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInAnonymousFunctionInInlinedCallWithCrossInline.kt
+++ b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInAnonymousFunctionInInlinedCallWithCrossInline.kt
@@ -3,9 +3,9 @@ package stopInAnonymousFunctionInInlinedCallWithCrossInline
 // KT-15282
 
 fun main(args: Array<String>) {
-    foo(fun () {
+    foo(fun (): Int {
         //Breakpoint!
-        12
+        return 12
     })
 }
 
diff --git a/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInAnonymousFunctionInInlinedCallWithCrossInlineDex.kt b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInAnonymousFunctionInInlinedCallWithCrossInlineDex.kt
index e2f8cb37634..68553126c99 100644
--- a/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInAnonymousFunctionInInlinedCallWithCrossInlineDex.kt
+++ b/idea/testData/debugger/tinyApp/src/stepping/stepOver/stopInAnonymousFunctionInInlinedCallWithCrossInlineDex.kt
@@ -3,9 +3,9 @@ package stopInAnonymousFunctionInInlinedCallWithCrossInlineDex
 // KT-15282
 
 fun main(args: Array<String>) {
-    foo(fun () {
+    foo(fun (): Int {
         //Breakpoint!
-        12
+        return 12
     })
 }