diff --git a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt
index 6bfe2e38b79..aadecd0c70f 100644
--- a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt
@@ -564,9 +564,8 @@ fun main(args: Array<String>) {
         }
 
         testClass(javaClass<AbstractKotlinEvaluateExpressionTest>()) {
-            model("debugger/tinyApp/src/evaluate/singleBreakpoint", testMethod = "doSingleBreakpointTest")
+            model("debugger/tinyApp/src/evaluate/singleBreakpoint", testMethod = "doSingleBreakpointTest", recursive = true)
             model("debugger/tinyApp/src/evaluate/multipleBreakpoints", testMethod = "doMultipleBreakpointsTest", recursive = true)
-            model("debugger/tinyApp/src/evaluate/frame", testMethod = "doSingleBreakpointTest")
         }
 
         testClass(javaClass<AbstractStubBuilderTest>()) {
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/frame/frameAnonymousObject.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameAnonymousObject.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/evaluate/frame/frameAnonymousObject.kt
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameAnonymousObject.kt
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/frame/frameClassObject.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameClassObject.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/evaluate/frame/frameClassObject.kt
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameClassObject.kt
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/frame/frameExtFunExtFun.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameExtFunExtFun.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/evaluate/frame/frameExtFunExtFun.kt
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameExtFunExtFun.kt
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/frame/frameExtensionFun.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameExtensionFun.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/evaluate/frame/frameExtensionFun.kt
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameExtensionFun.kt
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/frame/frameInnerClass.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInnerClass.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/evaluate/frame/frameInnerClass.kt
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInnerClass.kt
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/frame/frameInnerLambda.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInnerLambda.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/evaluate/frame/frameInnerLambda.kt
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInnerLambda.kt
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/frame/frameLambda.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameLambda.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/evaluate/frame/frameLambda.kt
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameLambda.kt
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/frame/frameLambdaNotUsed.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameLambdaNotUsed.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/evaluate/frame/frameLambdaNotUsed.kt
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameLambdaNotUsed.kt
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/frame/frameObject.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameObject.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/evaluate/frame/frameObject.kt
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameObject.kt
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/frame/frameSharedVar.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameSharedVar.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/evaluate/frame/frameSharedVar.kt
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameSharedVar.kt
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/frame/frameSimple.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameSimple.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/evaluate/frame/frameSimple.kt
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameSimple.kt
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/frame/frameThis0.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/evaluate/frame/frameThis0.kt
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0.kt
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/frame/frameThis0Ext.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0Ext.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/evaluate/frame/frameThis0Ext.kt
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0Ext.kt
diff --git a/idea/testData/debugger/tinyApp/src/evaluate/frame/frameThis0This0.kt b/idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0This0.kt
similarity index 100%
rename from idea/testData/debugger/tinyApp/src/evaluate/frame/frameThis0This0.kt
rename to idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0This0.kt
diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java
index 272d9b8b724..7a7aac57892 100644
--- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java
@@ -27,9 +27,10 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@InnerTestClasses({KotlinEvaluateExpressionTestGenerated.SingleBreakpoint.class, KotlinEvaluateExpressionTestGenerated.MultipleBreakpoints.class, KotlinEvaluateExpressionTestGenerated.Frame.class})
+@InnerTestClasses({KotlinEvaluateExpressionTestGenerated.SingleBreakpoint.class, KotlinEvaluateExpressionTestGenerated.MultipleBreakpoints.class})
 public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluateExpressionTest {
     @TestMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint")
+    @InnerTestClasses({SingleBreakpoint.Frame.class})
     public static class SingleBreakpoint extends AbstractKotlinEvaluateExpressionTest {
         @TestMetadata("abstractFunCall.kt")
         public void testAbstractFunCall() throws Exception {
@@ -140,6 +141,90 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat
             doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/.kt.kt");
         }
         
+        @TestMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame")
+        public static class Frame extends AbstractKotlinEvaluateExpressionTest {
+            public void testAllFilesPresentInFrame() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame"), Pattern.compile("^(.+)\\.kt$"), true);
+            }
+            
+            @TestMetadata("frameAnonymousObject.kt")
+            public void testFrameAnonymousObject() throws Exception {
+                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameAnonymousObject.kt");
+            }
+            
+            @TestMetadata("frameClassObject.kt")
+            public void testFrameClassObject() throws Exception {
+                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameClassObject.kt");
+            }
+            
+            @TestMetadata("frameExtFunExtFun.kt")
+            public void testFrameExtFunExtFun() throws Exception {
+                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameExtFunExtFun.kt");
+            }
+            
+            @TestMetadata("frameExtensionFun.kt")
+            public void testFrameExtensionFun() throws Exception {
+                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameExtensionFun.kt");
+            }
+            
+            @TestMetadata("frameInnerClass.kt")
+            public void testFrameInnerClass() throws Exception {
+                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInnerClass.kt");
+            }
+            
+            @TestMetadata("frameInnerLambda.kt")
+            public void testFrameInnerLambda() throws Exception {
+                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInnerLambda.kt");
+            }
+            
+            @TestMetadata("frameLambda.kt")
+            public void testFrameLambda() throws Exception {
+                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameLambda.kt");
+            }
+            
+            @TestMetadata("frameLambdaNotUsed.kt")
+            public void testFrameLambdaNotUsed() throws Exception {
+                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameLambdaNotUsed.kt");
+            }
+            
+            @TestMetadata("frameObject.kt")
+            public void testFrameObject() throws Exception {
+                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameObject.kt");
+            }
+            
+            @TestMetadata("frameSharedVar.kt")
+            public void testFrameSharedVar() throws Exception {
+                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameSharedVar.kt");
+            }
+            
+            @TestMetadata("frameSimple.kt")
+            public void testFrameSimple() throws Exception {
+                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameSimple.kt");
+            }
+            
+            @TestMetadata("frameThis0.kt")
+            public void testFrameThis0() throws Exception {
+                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0.kt");
+            }
+            
+            @TestMetadata("frameThis0Ext.kt")
+            public void testFrameThis0Ext() throws Exception {
+                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0Ext.kt");
+            }
+            
+            @TestMetadata("frameThis0This0.kt")
+            public void testFrameThis0This0() throws Exception {
+                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0This0.kt");
+            }
+            
+        }
+        
+        public static Test innerSuite() {
+            TestSuite suite = new TestSuite("SingleBreakpoint");
+            suite.addTestSuite(SingleBreakpoint.class);
+            suite.addTestSuite(Frame.class);
+            return suite;
+        }
     }
     
     @TestMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints")
@@ -215,89 +300,10 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat
         }
     }
     
-    @TestMetadata("idea/testData/debugger/tinyApp/src/evaluate/frame")
-    public static class Frame extends AbstractKotlinEvaluateExpressionTest {
-        public void testAllFilesPresentInFrame() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/frame"), Pattern.compile("^(.+)\\.kt$"), true);
-        }
-        
-        @TestMetadata("frameAnonymousObject.kt")
-        public void testFrameAnonymousObject() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/frame/frameAnonymousObject.kt");
-        }
-        
-        @TestMetadata("frameClassObject.kt")
-        public void testFrameClassObject() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/frame/frameClassObject.kt");
-        }
-        
-        @TestMetadata("frameExtFunExtFun.kt")
-        public void testFrameExtFunExtFun() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/frame/frameExtFunExtFun.kt");
-        }
-        
-        @TestMetadata("frameExtensionFun.kt")
-        public void testFrameExtensionFun() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/frame/frameExtensionFun.kt");
-        }
-        
-        @TestMetadata("frameInnerClass.kt")
-        public void testFrameInnerClass() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/frame/frameInnerClass.kt");
-        }
-        
-        @TestMetadata("frameInnerLambda.kt")
-        public void testFrameInnerLambda() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/frame/frameInnerLambda.kt");
-        }
-        
-        @TestMetadata("frameLambda.kt")
-        public void testFrameLambda() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/frame/frameLambda.kt");
-        }
-        
-        @TestMetadata("frameLambdaNotUsed.kt")
-        public void testFrameLambdaNotUsed() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/frame/frameLambdaNotUsed.kt");
-        }
-        
-        @TestMetadata("frameObject.kt")
-        public void testFrameObject() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/frame/frameObject.kt");
-        }
-        
-        @TestMetadata("frameSharedVar.kt")
-        public void testFrameSharedVar() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/frame/frameSharedVar.kt");
-        }
-        
-        @TestMetadata("frameSimple.kt")
-        public void testFrameSimple() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/frame/frameSimple.kt");
-        }
-        
-        @TestMetadata("frameThis0.kt")
-        public void testFrameThis0() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/frame/frameThis0.kt");
-        }
-        
-        @TestMetadata("frameThis0Ext.kt")
-        public void testFrameThis0Ext() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/frame/frameThis0Ext.kt");
-        }
-        
-        @TestMetadata("frameThis0This0.kt")
-        public void testFrameThis0This0() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/frame/frameThis0This0.kt");
-        }
-        
-    }
-    
     public static Test suite() {
         TestSuite suite = new TestSuite("KotlinEvaluateExpressionTestGenerated");
-        suite.addTestSuite(SingleBreakpoint.class);
+        suite.addTest(SingleBreakpoint.innerSuite());
         suite.addTest(MultipleBreakpoints.innerSuite());
-        suite.addTestSuite(Frame.class);
         return suite;
     }
 }