diff --git a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt
index 86fd07c649c..6fe68a0e583 100644
--- a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt
+++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt
@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.test.runners.*
 import org.jetbrains.kotlin.test.runners.codegen.*
 import org.jetbrains.kotlin.test.runners.ir.AbstractFir2IrTextTest
 import org.jetbrains.kotlin.test.runners.ir.AbstractIrTextTest
-import org.jetbrains.kotlin.visualizer.AbstractVisualizerBlackBoxTest
 import org.jetbrains.kotlin.visualizer.fir.AbstractFirVisualizerTest
 import org.jetbrains.kotlin.visualizer.psi.AbstractPsiVisualizerTest
 import org.junit.jupiter.api.parallel.Execution
@@ -178,11 +177,5 @@ fun generateJUnit5CompilerTests(args: Array<String>) {
                 model("uncommonCases/testFiles")
             }
         }
-
-        testGroup("compiler/visualizer/tests-gen", "compiler/testData") {
-            testClass<AbstractVisualizerBlackBoxTest>() {
-                model("codegen/box")
-            }
-        }
     }
 }
diff --git a/compiler/visualizer/build.gradle.kts b/compiler/visualizer/build.gradle.kts
index 37c93a849f9..d19537ec75e 100644
--- a/compiler/visualizer/build.gradle.kts
+++ b/compiler/visualizer/build.gradle.kts
@@ -20,6 +20,7 @@ dependencies {
     testApi(projectTests(":compiler:tests-common-new"))
     testApi(projectTests(":compiler:test-infrastructure"))
     testApi(projectTests(":compiler:fir:analysis-tests:legacy-fir-tests"))
+    testImplementation(projectTests(":generators:test-generator"))
 }
 
 val generationRoot = projectDir.resolve("tests-gen")
@@ -46,3 +47,5 @@ projectTest(parallel = true, jUnit5Enabled = true) {
 }
 
 testsJar()
+
+val generateVisualizerTests by generator("org.jetbrains.kotlin.visualizer.GenerateVisualizerTestsKt")
\ No newline at end of file
diff --git a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/GenerateVisualizerTests.kt b/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/GenerateVisualizerTests.kt
new file mode 100644
index 00000000000..26e57310455
--- /dev/null
+++ b/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/GenerateVisualizerTests.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2010-2021 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.visualizer
+
+import org.jetbrains.kotlin.test.generators.generateTestGroupSuiteWithJUnit5
+
+fun main(args: Array<String>) {
+    System.setProperty("java.awt.headless", "true")
+
+    generateTestGroupSuiteWithJUnit5(args) {
+        testGroup("compiler/visualizer/tests-gen", "compiler/testData") {
+            testClass<AbstractVisualizerBlackBoxTest>() {
+                model("codegen/box")
+            }
+        }
+    }
+}