diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
index ef91700697d..ce513229675 100644
--- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
+++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
@@ -29,6 +29,8 @@ import org.jetbrains.kotlin.codegen.*
 import org.jetbrains.kotlin.codegen.defaultConstructor.AbstractDefaultArgumentsReflectionTest
 import org.jetbrains.kotlin.codegen.flags.AbstractWriteFlagsTest
 import org.jetbrains.kotlin.codegen.ir.AbstractIrBlackBoxCodegenTest
+import org.jetbrains.kotlin.codegen.ir.AbstractIrBlackBoxInlineCodegenTest
+import org.jetbrains.kotlin.codegen.ir.AbstractIrCompileKotlinAgainstInlineKotlinTest
 import org.jetbrains.kotlin.generators.tests.generator.testGroup
 import org.jetbrains.kotlin.integration.AbstractAntTaskTest
 import org.jetbrains.kotlin.ir.AbstractIrCfgTestCase
@@ -351,4 +353,18 @@ fun main(args: Array<String>) {
             model("kdoc/lexer")
         }
     }
+
+    testGroup("compiler/tests-ir-jvm/tests", "compiler/testData") {
+        testClass<AbstractIrBlackBoxCodegenTest> {
+            model("codegen/box", targetBackend = TargetBackend.JVM)
+        }
+
+        testClass<AbstractIrBlackBoxInlineCodegenTest> {
+            model("codegen/boxInline")
+        }
+
+        testClass<AbstractIrCompileKotlinAgainstInlineKotlinTest> {
+            model("codegen/boxInline")
+        }
+    }
 }
diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 40542229520..4501e54368b 100755
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -170,20 +170,6 @@ import org.jetbrains.kotlin.test.TargetBackend
 fun main(args: Array<String>) {
     System.setProperty("java.awt.headless", "true")
 
-    testGroup("compiler/tests-ir-jvm/tests", "compiler/testData") {
-        testClass<AbstractIrBlackBoxCodegenTest> {
-            model("codegen/box", targetBackend = TargetBackend.JVM)
-        }
-
-        testClass<AbstractIrBlackBoxInlineCodegenTest> {
-            model("codegen/boxInline")
-        }
-
-        testClass<AbstractIrCompileKotlinAgainstInlineKotlinTest> {
-            model("codegen/boxInline")
-        }
-    }
-
     testGroup("compiler/tests-java8/tests", "compiler/testData") {
         testClass<AbstractBlackBoxCodegenTest>("BlackBoxWithJava8CodegenTestGenerated") {
             model("codegen/java8/box")