diff --git a/generators/analysis-api-generator/build.gradle.kts b/generators/analysis-api-generator/build.gradle.kts
index 19ffea85088..19f8d1d3501 100644
--- a/generators/analysis-api-generator/build.gradle.kts
+++ b/generators/analysis-api-generator/build.gradle.kts
@@ -20,4 +20,6 @@ dependencies {
     testApiJUnit5()
 }
 
-val generateFrontendApiTests by generator("org.jetbrains.kotlin.generators.tests.analysis.api.GenerateTestsKt")
+val generateFrontendApiTests by generator("org.jetbrains.kotlin.generators.tests.analysis.api.GenerateAnalysisApiTestsKt")
+
+testsJar()
\ No newline at end of file
diff --git a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/GenerateTests.kt b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/GenerateAnalysisApiTests.kt
similarity index 100%
rename from generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/GenerateTests.kt
rename to generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/GenerateAnalysisApiTests.kt
diff --git a/plugins/pill/generate-all-tests/build.gradle.kts b/plugins/pill/generate-all-tests/build.gradle.kts
index 17cbaf32f71..18031c17382 100644
--- a/plugins/pill/generate-all-tests/build.gradle.kts
+++ b/plugins/pill/generate-all-tests/build.gradle.kts
@@ -13,7 +13,8 @@ val depenencyProjects = arrayOf(
     ":compiler:visualizer",
     ":js:js.tests",
     ":compiler:tests-java8",
-    ":core:descriptors.runtime"
+    ":core:descriptors.runtime",
+    ":generators:analysis-api-generator"
 )
 
 dependencies {
diff --git a/plugins/pill/generate-all-tests/test/org/jetbrains/kotlin/pill/generateAllTests/Main.java b/plugins/pill/generate-all-tests/test/org/jetbrains/kotlin/pill/generateAllTests/Main.java
index 559832b2d0c..a574cbbd3d6 100644
--- a/plugins/pill/generate-all-tests/test/org/jetbrains/kotlin/pill/generateAllTests/Main.java
+++ b/plugins/pill/generate-all-tests/test/org/jetbrains/kotlin/pill/generateAllTests/Main.java
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.pill.generateAllTests;
 import org.jetbrains.kotlin.generators.tests.*;
 import org.jetbrains.kotlin.generators.InconsistencyChecker;
 import org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt;
+import org.jetbrains.kotlin.generators.tests.analysis.api.GenerateAnalysisApiTestsKt;
 
 import java.util.List;
 
@@ -18,6 +19,7 @@ public class Main {
         GenerateJsTestsKt.main(args);
         GenerateJava8TestsKt.main(args);
         GenerateRuntimeDescriptorTestsKt.main(args);
+        GenerateAnalysisApiTestsKt.main(args);
 
         boolean dryRun = InconsistencyChecker.Companion.hasDryRunArg(args);
         List<String> affectedFiles = InconsistencyChecker.Companion.inconsistencyChecker(dryRun).getAffectedFiles();