diff --git a/buildSrc/src/main/kotlin/CommonUtil.kt b/buildSrc/src/main/kotlin/CommonUtil.kt
index 274187d8404..35d0770916f 100644
--- a/buildSrc/src/main/kotlin/CommonUtil.kt
+++ b/buildSrc/src/main/kotlin/CommonUtil.kt
@@ -62,3 +62,9 @@ var Project.jvmTarget: String?
 var Project.javaHome: String?
     get() = extra.takeIf { it.has("javaHome") }?.get("javaHome") as? String
     set(v) { extra["javaHome"] = v }
+
+fun Project.generator(fqName: String) = task<JavaExec> {
+    classpath = the<JavaPluginConvention>().sourceSets["test"].runtimeClasspath
+    main = fqName
+    workingDir = rootDir
+}
diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts
index d168faf571f..dc57d5133f7 100644
--- a/generators/build.gradle.kts
+++ b/generators/build.gradle.kts
@@ -61,12 +61,6 @@ projectTest {
     workingDir = rootDir
 }
 
-fun generator(fqName: String) = task<JavaExec> {
-    classpath = the<JavaPluginConvention>().sourceSets["test"].runtimeClasspath
-    main = fqName
-    workingDir = rootDir
-}
-
 val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateTestsKt")
 
 val generateProtoBuf by generator("org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufKt")
diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts
index 06522771cd0..fbcbb36678c 100644
--- a/ultimate/build.gradle.kts
+++ b/ultimate/build.gradle.kts
@@ -165,3 +165,5 @@ projectTest {
     dependsOn(preparePluginXml)
     workingDir = rootDir
 }
+
+val generateTests by generator("org.jetbrains.kotlin.tests.GenerateUltimateTestsKt")
diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/GenerateSpringDependencyActionTestGenerated.java b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/GenerateSpringDependencyActionTestGenerated.java
index 1d2c7096ad3..45d599af15c 100644
--- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/GenerateSpringDependencyActionTestGenerated.java
+++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/generate/GenerateSpringDependencyActionTestGenerated.java
@@ -16,7 +16,6 @@
 
 package org.jetbrains.kotlin.idea.spring.tests.generate;
 
-import com.intellij.idea.Bombed;
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
@@ -50,9 +49,6 @@ public class GenerateSpringDependencyActionTestGenerated extends AbstractGenerat
     }
 
     @TestMetadata("autowiredDependencies/multiplePropertiesAnnotationConfig.kt")
-    @Bombed(day = 1, month = 10, year = 2017,
-            description = "suffer from IDEA bug",
-            user = "nicolay.mitropolsky")
     public void testAutowiredDependencies_MultiplePropertiesAnnotationConfig() throws Exception {
         String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/generate/autowiredDependencies/multiplePropertiesAnnotationConfig.kt");
         doTest(fileName);
diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java
index 4443033c3f4..49869c1ab6d 100644
--- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java
+++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/SpringClassAnnotatorTestGenerated.java
@@ -16,7 +16,6 @@
 
 package org.jetbrains.kotlin.idea.spring.tests.gutter;
 
-import com.intellij.idea.Bombed;
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
@@ -38,9 +37,6 @@ public class SpringClassAnnotatorTestGenerated extends AbstractSpringClassAnnota
     }
 
     @TestMetadata("autowiredBeanCandidates/autowiredBeanCandidates.test")
-    @Bombed(day = 1, month = 10, year = 2017,
-            description = "flacky because SpringAutowireUtil#getAutowiredMembers() collecting duplicate elements for kotlin sometimes",
-            user = "nicolay.mitropolsky")
     public void testAutowiredBeanCandidates_AutowiredBeanCandidates() throws Exception {
         String fileName = KotlinTestUtils.navigationMetadata("ultimate/testData/spring/core/gutter/autowiredBeanCandidates/autowiredBeanCandidates.test");
         doTest(fileName);
diff --git a/ultimate/tests/org/jetbrains/kotlin/tests/GenerateTests.kt b/ultimate/tests/org/jetbrains/kotlin/tests/GenerateUltimateTests.kt
similarity index 98%
rename from ultimate/tests/org/jetbrains/kotlin/tests/GenerateTests.kt
rename to ultimate/tests/org/jetbrains/kotlin/tests/GenerateUltimateTests.kt
index 700e79a8591..ed13214cc53 100644
--- a/ultimate/tests/org/jetbrains/kotlin/tests/GenerateTests.kt
+++ b/ultimate/tests/org/jetbrains/kotlin/tests/GenerateUltimateTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2016 JetBrains s.r.o.
+ * Copyright 2010-2017 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.