diff --git a/idea/testData/debugger/tinyApp/outs/doNotSkipClassloader.out b/idea/testData/debugger/tinyApp/outs/doNotSkipClassloader.out
new file mode 100644
index 00000000000..8e3db3bdf17
--- /dev/null
+++ b/idea/testData/debugger/tinyApp/outs/doNotSkipClassloader.out
@@ -0,0 +1,8 @@
+LineBreakpoint created at doNotSkipClassloader.kt:7
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! doNotSkipClassloader.DoNotSkipClassloaderPackage
+Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+doNotSkipClassloader.kt:6
+ClassLoader.class:98
+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/doNotSkipConstructors.out b/idea/testData/debugger/tinyApp/outs/doNotSkipConstructors.out
new file mode 100644
index 00000000000..1420897d38b
--- /dev/null
+++ b/idea/testData/debugger/tinyApp/outs/doNotSkipConstructors.out
@@ -0,0 +1,9 @@
+LineBreakpoint created at doNotSkipConstructors.kt:5
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! doNotSkipConstructors.DoNotSkipConstructorsPackage
+Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+doNotSkipConstructors.kt:4
+doNotSkipConstructors.kt:10
+doNotSkipConstructors.kt:4
+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/stepIntoSpecificKotlinClasses.out b/idea/testData/debugger/tinyApp/outs/stepIntoSpecificKotlinClasses.out
new file mode 100644
index 00000000000..fd81d4e7941
--- /dev/null
+++ b/idea/testData/debugger/tinyApp/outs/stepIntoSpecificKotlinClasses.out
@@ -0,0 +1,12 @@
+LineBreakpoint created at stepIntoSpecificKotlinClasses.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 !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepIntoSpecificKotlinClasses.StepIntoSpecificKotlinClassesPackage
+Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+stepIntoSpecificKotlinClasses.kt:7
+MyJavaClass.java:11
+stepIntoSpecificKotlinClasses.kt:7
+Intrinsics.class:17
+stepIntoSpecificKotlinClasses.kt:7
+stepIntoSpecificKotlinClasses.kt:8
+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/stepIntoStdlib.out b/idea/testData/debugger/tinyApp/outs/stepIntoStdlib.out
new file mode 100644
index 00000000000..b303ff9dfc6
--- /dev/null
+++ b/idea/testData/debugger/tinyApp/outs/stepIntoStdlib.out
@@ -0,0 +1,8 @@
+LineBreakpoint created at stepIntoStdlib.kt:6
+!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !APP_PATH!\classes;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! stepIntoStdlib.StepIntoStdlibPackage
+Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
+stepIntoStdlib.kt:5
+KotlinPackage.class:-1
+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/filters/doNotSkipClassloader.kt b/idea/testData/debugger/tinyApp/src/filters/doNotSkipClassloader.kt
new file mode 100644
index 00000000000..2b0745aafbe
--- /dev/null
+++ b/idea/testData/debugger/tinyApp/src/filters/doNotSkipClassloader.kt
@@ -0,0 +1,19 @@
+package doNotSkipClassloader
+
+fun main(args: Array<String>) {
+    val loader = javaClass<A>().getClassLoader()!!
+    try {
+        //Breakpoint!
+        val aaa = loader.loadClass("skipClassloader.A")
+    }
+    catch (e: ClassNotFoundException) {
+        e.printStackTrace()
+    }
+
+}
+
+class A
+
+// TRACING_FILTERS_ENABLED: false
+// SKIP_CLASSLOADERS: false
+
diff --git a/idea/testData/debugger/tinyApp/src/filters/doNotSkipConstructors.kt b/idea/testData/debugger/tinyApp/src/filters/doNotSkipConstructors.kt
new file mode 100644
index 00000000000..454aa0e02ac
--- /dev/null
+++ b/idea/testData/debugger/tinyApp/src/filters/doNotSkipConstructors.kt
@@ -0,0 +1,16 @@
+package doNotSkipConstructors
+
+fun main(args: Array<String>) {
+    //Breakpoint!
+    A()
+    val b = 1
+}
+
+class A {
+    {
+        val a = 1
+    }
+}
+
+// SKIP_CONSTRUCTORS: false
+// REPEAT: 2
diff --git a/idea/testData/debugger/tinyApp/src/filters/stepIntoSpecificKotlinClasses.kt b/idea/testData/debugger/tinyApp/src/filters/stepIntoSpecificKotlinClasses.kt
new file mode 100644
index 00000000000..a9609bb69c8
--- /dev/null
+++ b/idea/testData/debugger/tinyApp/src/filters/stepIntoSpecificKotlinClasses.kt
@@ -0,0 +1,14 @@
+package stepIntoSpecificKotlinClasses
+
+import stepInto.MyJavaClass
+
+fun main(args: Array<String>) {
+    val myClass = MyJavaClass()
+    //Breakpoint!
+    val a: String = myClass.testNotNullFun()
+    val b = 1
+}
+
+// REPEAT: 5
+// DISABLE_KOTLIN_INTERNAL_CLASSES: false
+// TRACING_FILTERS_ENABLED: false
diff --git a/idea/testData/debugger/tinyApp/src/filters/stepIntoStdlib.kt b/idea/testData/debugger/tinyApp/src/filters/stepIntoStdlib.kt
new file mode 100644
index 00000000000..215f361775f
--- /dev/null
+++ b/idea/testData/debugger/tinyApp/src/filters/stepIntoStdlib.kt
@@ -0,0 +1,10 @@
+package stepIntoStdlib
+
+fun main(args: Array<String>) {
+    val a = intArray(1)
+    //Breakpoint!
+    a.withIndices()
+    val b = 1
+}
+
+// TRACING_FILTERS_ENABLED: false
diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinSteppingTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinSteppingTestGenerated.java
index 2942da04fee..2b4f1a7a3a7 100644
--- a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinSteppingTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinSteppingTestGenerated.java
@@ -186,6 +186,16 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest {
             doStepIntoTest("idea/testData/debugger/tinyApp/src/filters/checkNotNull.kt");
         }
         
+        @TestMetadata("doNotSkipClassloader.kt")
+        public void testDoNotSkipClassloader() throws Exception {
+            doStepIntoTest("idea/testData/debugger/tinyApp/src/filters/doNotSkipClassloader.kt");
+        }
+        
+        @TestMetadata("doNotSkipConstructors.kt")
+        public void testDoNotSkipConstructors() throws Exception {
+            doStepIntoTest("idea/testData/debugger/tinyApp/src/filters/doNotSkipConstructors.kt");
+        }
+        
         @TestMetadata("npe.kt")
         public void testNpe() throws Exception {
             doStepIntoTest("idea/testData/debugger/tinyApp/src/filters/npe.kt");
@@ -211,6 +221,16 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest {
             doStepIntoTest("idea/testData/debugger/tinyApp/src/filters/stdlibStep.kt");
         }
         
+        @TestMetadata("stepIntoSpecificKotlinClasses.kt")
+        public void testStepIntoSpecificKotlinClasses() throws Exception {
+            doStepIntoTest("idea/testData/debugger/tinyApp/src/filters/stepIntoSpecificKotlinClasses.kt");
+        }
+        
+        @TestMetadata("stepIntoStdlib.kt")
+        public void testStepIntoStdlib() throws Exception {
+            doStepIntoTest("idea/testData/debugger/tinyApp/src/filters/stepIntoStdlib.kt");
+        }
+        
     }
     
     public static Test suite() {