diff --git a/compiler/testData/codegen/controlStructures/ifInWhile.kt b/compiler/testData/codegen/boxWithStdlib/fullJdk/ifInWhile.kt
similarity index 100%
rename from compiler/testData/codegen/controlStructures/ifInWhile.kt
rename to compiler/testData/codegen/boxWithStdlib/fullJdk/ifInWhile.kt
diff --git a/compiler/testData/codegen/extensionFunctions/intCountDownLatchExtension.kt b/compiler/testData/codegen/boxWithStdlib/fullJdk/intCountDownLatchExtension.kt
similarity index 100%
rename from compiler/testData/codegen/extensionFunctions/intCountDownLatchExtension.kt
rename to compiler/testData/codegen/boxWithStdlib/fullJdk/intCountDownLatchExtension.kt
diff --git a/compiler/testData/codegen/regressions/kt2423.kt b/compiler/testData/codegen/boxWithStdlib/fullJdk/kt2423.kt
similarity index 100%
rename from compiler/testData/codegen/regressions/kt2423.kt
rename to compiler/testData/codegen/boxWithStdlib/fullJdk/kt2423.kt
diff --git a/compiler/testData/codegen/regressions/kt2509.kt b/compiler/testData/codegen/boxWithStdlib/fullJdk/kt2509.kt
similarity index 100%
rename from compiler/testData/codegen/regressions/kt2509.kt
rename to compiler/testData/codegen/boxWithStdlib/fullJdk/kt2509.kt
diff --git a/compiler/testData/codegen/regressions/kt434.kt b/compiler/testData/codegen/boxWithStdlib/fullJdk/kt434.kt
similarity index 100%
rename from compiler/testData/codegen/regressions/kt434.kt
rename to compiler/testData/codegen/boxWithStdlib/fullJdk/kt434.kt
diff --git a/compiler/testData/codegen/controlStructures/sync.kt b/compiler/testData/codegen/boxWithStdlib/fullJdk/sync.kt
similarity index 100%
rename from compiler/testData/codegen/controlStructures/sync.kt
rename to compiler/testData/codegen/boxWithStdlib/fullJdk/sync.kt
diff --git a/compiler/tests/org/jetbrains/jet/codegen/FullJdkCodegenTest.java b/compiler/tests/org/jetbrains/jet/codegen/FullJdkCodegenTest.java
deleted file mode 100644
index aa72ba858ea..00000000000
--- a/compiler/tests/org/jetbrains/jet/codegen/FullJdkCodegenTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2010-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.codegen;
-
-import org.jetbrains.jet.JetTestUtils;
-
-public class FullJdkCodegenTest extends CodegenTestCase {
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        myEnvironment = JetTestUtils.createEnvironmentWithFullJdk(getTestRootDisposable());
-    }
-
-    public void testKt434() {
-        blackBoxFile("regressions/kt434.kt");
-    }
-
-    public void testSynchronized() {
-        blackBoxFile("controlStructures/sync.kt");
-    }
-
-    public void testIfInWhile() {
-        blackBoxFile("controlStructures/ifInWhile.kt");
-    }
-
-    public void testKt2423() {
-        blackBoxFile("regressions/kt2423.kt");
-    }
-
-    public void testKt2509() {
-        blackBoxFile("regressions/kt2509.kt");
-    }
-
-    public void testIntCountDownLatchExtension() {
-        blackBoxFile("extensionFunctions/intCountDownLatchExtension.kt");
-    }
-}
diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java
index 5d244825067..16e827b004a 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java
@@ -31,7 +31,7 @@ import org.jetbrains.jet.codegen.generated.AbstractBlackBoxWithStdlibCodegenTest
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/codegen/boxWithStdlib")
-@InnerTestClasses({BlackBoxWithStdlibCodegenTestGenerated.DataClasses.class, BlackBoxWithStdlibCodegenTestGenerated.Ranges.class, BlackBoxWithStdlibCodegenTestGenerated.Regressions.class})
+@InnerTestClasses({BlackBoxWithStdlibCodegenTestGenerated.DataClasses.class, BlackBoxWithStdlibCodegenTestGenerated.FullJdk.class, BlackBoxWithStdlibCodegenTestGenerated.Ranges.class, BlackBoxWithStdlibCodegenTestGenerated.Regressions.class})
 public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxWithStdlibCodegenTest {
     public void testAllFilesPresentInBoxWithStdlib() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/boxWithStdlib"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -317,6 +317,44 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxWith
         }
     }
     
+    @TestMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk")
+    public static class FullJdk extends AbstractBlackBoxWithStdlibCodegenTest {
+        public void testAllFilesPresentInFullJdk() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/boxWithStdlib/fullJdk"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+        
+        @TestMetadata("ifInWhile.kt")
+        public void testIfInWhile() throws Exception {
+            blackBoxFileByFullPath("compiler/testData/codegen/boxWithStdlib/fullJdk/ifInWhile.kt");
+        }
+        
+        @TestMetadata("intCountDownLatchExtension.kt")
+        public void testIntCountDownLatchExtension() throws Exception {
+            blackBoxFileByFullPath("compiler/testData/codegen/boxWithStdlib/fullJdk/intCountDownLatchExtension.kt");
+        }
+        
+        @TestMetadata("kt2423.kt")
+        public void testKt2423() throws Exception {
+            blackBoxFileByFullPath("compiler/testData/codegen/boxWithStdlib/fullJdk/kt2423.kt");
+        }
+        
+        @TestMetadata("kt2509.kt")
+        public void testKt2509() throws Exception {
+            blackBoxFileByFullPath("compiler/testData/codegen/boxWithStdlib/fullJdk/kt2509.kt");
+        }
+        
+        @TestMetadata("kt434.kt")
+        public void testKt434() throws Exception {
+            blackBoxFileByFullPath("compiler/testData/codegen/boxWithStdlib/fullJdk/kt434.kt");
+        }
+        
+        @TestMetadata("sync.kt")
+        public void testSync() throws Exception {
+            blackBoxFileByFullPath("compiler/testData/codegen/boxWithStdlib/fullJdk/sync.kt");
+        }
+        
+    }
+    
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/ranges")
     @InnerTestClasses({Ranges.Expression.class, Ranges.Literal.class})
     public static class Ranges extends AbstractBlackBoxWithStdlibCodegenTest {
@@ -631,6 +669,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxWith
         TestSuite suite = new TestSuite("BlackBoxWithStdlibCodegenTestGenerated");
         suite.addTestSuite(BlackBoxWithStdlibCodegenTestGenerated.class);
         suite.addTest(DataClasses.innerSuite());
+        suite.addTestSuite(FullJdk.class);
         suite.addTest(Ranges.innerSuite());
         suite.addTestSuite(Regressions.class);
         return suite;