diff --git a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt
index 1b0ca59bb91..27f4087775b 100644
--- a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt
@@ -589,8 +589,8 @@ fun main(args: Array<String>) {
         }
 
         testClass(javaClass<AbstractKotlinSteppingTest>()) {
-            model("debugger/tinyApp/src/stepInto", testMethod = "doStepIntoTest", testClassName = "StepInto")
-            model("debugger/tinyApp/src/stepInto", testMethod = "doSmartStepIntoTest", testClassName = "SmartStepInto")
+            model("debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto", testMethod = "doStepIntoTest", testClassName = "StepInto")
+            model("debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto", testMethod = "doSmartStepIntoTest", testClassName = "SmartStepInto")
             model("debugger/tinyApp/src/filters", testMethod = "doStepIntoTest")
         }
 
diff --git a/idea/testData/debugger/tinyApp/src/stepInto/classObjectFunFromClass.kt b/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/classObjectFunFromClass.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/stepInto/classObjectFunFromClass.kt
rename to idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/classObjectFunFromClass.kt
diff --git a/idea/testData/debugger/tinyApp/src/stepInto/classObjectFunFromTopLevel.kt b/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/classObjectFunFromTopLevel.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/stepInto/classObjectFunFromTopLevel.kt
rename to idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/classObjectFunFromTopLevel.kt
diff --git a/idea/testData/debugger/tinyApp/src/stepInto/extFun.kt b/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/extFun.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/stepInto/extFun.kt
rename to idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/extFun.kt
diff --git a/idea/testData/debugger/tinyApp/src/stepInto/javaFun.kt b/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/javaFun.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/stepInto/javaFun.kt
rename to idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/javaFun.kt
diff --git a/idea/testData/debugger/tinyApp/src/stepInto/memberFunFromClass.kt b/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberFunFromClass.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/stepInto/memberFunFromClass.kt
rename to idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberFunFromClass.kt
diff --git a/idea/testData/debugger/tinyApp/src/stepInto/memberFunFromTopLevel.kt b/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberFunFromTopLevel.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/stepInto/memberFunFromTopLevel.kt
rename to idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberFunFromTopLevel.kt
diff --git a/idea/testData/debugger/tinyApp/src/stepInto/memberGetterFromClass.kt b/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberGetterFromClass.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/stepInto/memberGetterFromClass.kt
rename to idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberGetterFromClass.kt
diff --git a/idea/testData/debugger/tinyApp/src/stepInto/memberGetterFromTopLevel.kt b/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberGetterFromTopLevel.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/stepInto/memberGetterFromTopLevel.kt
rename to idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberGetterFromTopLevel.kt
diff --git a/idea/testData/debugger/tinyApp/src/stepInto/objectFun.kt b/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/objectFun.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/stepInto/objectFun.kt
rename to idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/objectFun.kt
diff --git a/idea/testData/debugger/tinyApp/src/stepInto/topLevelFunFromClass.kt b/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelFunFromClass.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/stepInto/topLevelFunFromClass.kt
rename to idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelFunFromClass.kt
diff --git a/idea/testData/debugger/tinyApp/src/stepInto/topLevelFunFromTopLevel.kt b/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelFunFromTopLevel.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/stepInto/topLevelFunFromTopLevel.kt
rename to idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelFunFromTopLevel.kt
diff --git a/idea/testData/debugger/tinyApp/src/stepInto/topLevelGetterFromClass.kt b/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelGetterFromClass.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/stepInto/topLevelGetterFromClass.kt
rename to idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelGetterFromClass.kt
diff --git a/idea/testData/debugger/tinyApp/src/stepInto/topLevelGetterFromTopLevel.kt b/idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelGetterFromTopLevel.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/stepInto/topLevelGetterFromTopLevel.kt
rename to idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelGetterFromTopLevel.kt
diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinSteppingTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinSteppingTestGenerated.java
index 0f1fd1b0e7a..28a184966a2 100644
--- a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinSteppingTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinSteppingTestGenerated.java
@@ -31,176 +31,176 @@ import java.util.regex.Pattern;
 @InnerTestClasses({KotlinSteppingTestGenerated.StepInto.class, KotlinSteppingTestGenerated.SmartStepInto.class, KotlinSteppingTestGenerated.Filters.class})
 @RunWith(JUnit3RunnerWithInners.class)
 public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest {
-    @TestMetadata("idea/testData/debugger/tinyApp/src/stepInto")
+    @TestMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class StepInto extends AbstractKotlinSteppingTest {
         public void testAllFilesPresentInStepInto() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepInto"), Pattern.compile("^(.+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("classObjectFunFromClass.kt")
         public void testClassObjectFunFromClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/classObjectFunFromClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/classObjectFunFromClass.kt");
             doStepIntoTest(fileName);
         }
 
         @TestMetadata("classObjectFunFromTopLevel.kt")
         public void testClassObjectFunFromTopLevel() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/classObjectFunFromTopLevel.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/classObjectFunFromTopLevel.kt");
             doStepIntoTest(fileName);
         }
 
         @TestMetadata("extFun.kt")
         public void testExtFun() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/extFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/extFun.kt");
             doStepIntoTest(fileName);
         }
 
         @TestMetadata("javaFun.kt")
         public void testJavaFun() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/javaFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/javaFun.kt");
             doStepIntoTest(fileName);
         }
 
         @TestMetadata("memberFunFromClass.kt")
         public void testMemberFunFromClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/memberFunFromClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberFunFromClass.kt");
             doStepIntoTest(fileName);
         }
 
         @TestMetadata("memberFunFromTopLevel.kt")
         public void testMemberFunFromTopLevel() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/memberFunFromTopLevel.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberFunFromTopLevel.kt");
             doStepIntoTest(fileName);
         }
 
         @TestMetadata("memberGetterFromClass.kt")
         public void testMemberGetterFromClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/memberGetterFromClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberGetterFromClass.kt");
             doStepIntoTest(fileName);
         }
 
         @TestMetadata("memberGetterFromTopLevel.kt")
         public void testMemberGetterFromTopLevel() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/memberGetterFromTopLevel.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberGetterFromTopLevel.kt");
             doStepIntoTest(fileName);
         }
 
         @TestMetadata("objectFun.kt")
         public void testObjectFun() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/objectFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/objectFun.kt");
             doStepIntoTest(fileName);
         }
 
         @TestMetadata("topLevelFunFromClass.kt")
         public void testTopLevelFunFromClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/topLevelFunFromClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelFunFromClass.kt");
             doStepIntoTest(fileName);
         }
 
         @TestMetadata("topLevelFunFromTopLevel.kt")
         public void testTopLevelFunFromTopLevel() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/topLevelFunFromTopLevel.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelFunFromTopLevel.kt");
             doStepIntoTest(fileName);
         }
 
         @TestMetadata("topLevelGetterFromClass.kt")
         public void testTopLevelGetterFromClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/topLevelGetterFromClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelGetterFromClass.kt");
             doStepIntoTest(fileName);
         }
 
         @TestMetadata("topLevelGetterFromTopLevel.kt")
         public void testTopLevelGetterFromTopLevel() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/topLevelGetterFromTopLevel.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelGetterFromTopLevel.kt");
             doStepIntoTest(fileName);
         }
     }
 
-    @TestMetadata("idea/testData/debugger/tinyApp/src/stepInto")
+    @TestMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class SmartStepInto extends AbstractKotlinSteppingTest {
         public void testAllFilesPresentInSmartStepInto() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepInto"), Pattern.compile("^(.+)\\.kt$"), true);
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("classObjectFunFromClass.kt")
         public void testClassObjectFunFromClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/classObjectFunFromClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/classObjectFunFromClass.kt");
             doSmartStepIntoTest(fileName);
         }
 
         @TestMetadata("classObjectFunFromTopLevel.kt")
         public void testClassObjectFunFromTopLevel() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/classObjectFunFromTopLevel.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/classObjectFunFromTopLevel.kt");
             doSmartStepIntoTest(fileName);
         }
 
         @TestMetadata("extFun.kt")
         public void testExtFun() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/extFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/extFun.kt");
             doSmartStepIntoTest(fileName);
         }
 
         @TestMetadata("javaFun.kt")
         public void testJavaFun() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/javaFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/javaFun.kt");
             doSmartStepIntoTest(fileName);
         }
 
         @TestMetadata("memberFunFromClass.kt")
         public void testMemberFunFromClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/memberFunFromClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberFunFromClass.kt");
             doSmartStepIntoTest(fileName);
         }
 
         @TestMetadata("memberFunFromTopLevel.kt")
         public void testMemberFunFromTopLevel() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/memberFunFromTopLevel.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberFunFromTopLevel.kt");
             doSmartStepIntoTest(fileName);
         }
 
         @TestMetadata("memberGetterFromClass.kt")
         public void testMemberGetterFromClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/memberGetterFromClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberGetterFromClass.kt");
             doSmartStepIntoTest(fileName);
         }
 
         @TestMetadata("memberGetterFromTopLevel.kt")
         public void testMemberGetterFromTopLevel() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/memberGetterFromTopLevel.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/memberGetterFromTopLevel.kt");
             doSmartStepIntoTest(fileName);
         }
 
         @TestMetadata("objectFun.kt")
         public void testObjectFun() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/objectFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/objectFun.kt");
             doSmartStepIntoTest(fileName);
         }
 
         @TestMetadata("topLevelFunFromClass.kt")
         public void testTopLevelFunFromClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/topLevelFunFromClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelFunFromClass.kt");
             doSmartStepIntoTest(fileName);
         }
 
         @TestMetadata("topLevelFunFromTopLevel.kt")
         public void testTopLevelFunFromTopLevel() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/topLevelFunFromTopLevel.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelFunFromTopLevel.kt");
             doSmartStepIntoTest(fileName);
         }
 
         @TestMetadata("topLevelGetterFromClass.kt")
         public void testTopLevelGetterFromClass() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/topLevelGetterFromClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelGetterFromClass.kt");
             doSmartStepIntoTest(fileName);
         }
 
         @TestMetadata("topLevelGetterFromTopLevel.kt")
         public void testTopLevelGetterFromTopLevel() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/topLevelGetterFromTopLevel.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto/topLevelGetterFromTopLevel.kt");
             doSmartStepIntoTest(fileName);
         }
     }