diff --git a/buildSrc/src/main/kotlin/CommonUtil.kt b/buildSrc/src/main/kotlin/CommonUtil.kt
index daf26a29c44..72c8f9630c2 100644
--- a/buildSrc/src/main/kotlin/CommonUtil.kt
+++ b/buildSrc/src/main/kotlin/CommonUtil.kt
@@ -54,11 +54,12 @@ var Project.javaHome: String?
         extra["javaHome"] = v
     }
 
-fun Project.generator(fqName: String, sourceSet: SourceSet? = null) = smartJavaExec {
+fun Project.generator(fqName: String, sourceSet: SourceSet? = null, configure: JavaExec.() -> Unit = {}) = smartJavaExec {
     classpath = (sourceSet ?: testSourceSet).runtimeClasspath
     mainClass.set(fqName)
     workingDir = rootDir
     systemProperty("line.separator", "\n")
+    configure()
 }
 
 fun Project.getBooleanProperty(name: String): Boolean? = this.findProperty(name)?.let {
diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
index f2dc5e8c8bc..e01d48d01cf 100644
--- a/compiler/build.gradle.kts
+++ b/compiler/build.gradle.kts
@@ -98,6 +98,9 @@ projectTest(parallel = true) {
     }
 }
 
-val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateCompilerTestsKt")
+val generateTestData by generator("org.jetbrains.kotlin.generators.tests.GenerateCompilerTestDataKt")
+val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateCompilerTestsKt") {
+    dependsOn(generateTestData)
+}
 
 testsJar()
diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTestData.kt b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTestData.kt
new file mode 100644
index 00000000000..422ba3627e3
--- /dev/null
+++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTestData.kt
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.generators.tests
+
+fun main(args: Array<String>) {
+    GenerateRangesCodegenTestData.main(args)
+    GenerateInRangeExpressionTestData.main(args)
+    GenerateSteppedRangesCodegenTestData.main(args)
+    GeneratePrimitiveVsObjectEqualityTestData.main(args)
+}
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
index 1001e93c592..56a73b4b4c8 100644
--- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
+++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
@@ -181,11 +181,6 @@ fun main(args: Array<String>) {
                 model("parseCodeFragment/block", testMethod = "doBlockCodeFragmentParsingTest", extension = "kt")
             }
 
-            GenerateRangesCodegenTestData.main(args)
-            GenerateInRangeExpressionTestData.main(args)
-            GenerateSteppedRangesCodegenTestData.main(args)
-            GeneratePrimitiveVsObjectEqualityTestData.main(args)
-
             testClass<AbstractBlackBoxCodegenTest> {
                 model("codegen/box", targetBackend = TargetBackend.JVM)
             }
diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts
index 345a45cff74..8e98c305c41 100644
--- a/js/js.tests/build.gradle.kts
+++ b/js/js.tests/build.gradle.kts
@@ -272,7 +272,10 @@ projectTest("quickTest", true) {
 
 testsJar {}
 
-val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateJsTestsKt")
+val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateJsTestsKt") {
+    dependsOn(":compiler:generateTestData")
+}
+
 val testDataDir = project(":js:js.translator").projectDir.resolve("testData")
 
 extensions.getByType(NodeExtension::class.java).nodeModulesDir = testDataDir