diff --git a/compiler/container/build.gradle.kts b/compiler/container/build.gradle.kts
index ec2117ec4b2..166aea09e46 100644
--- a/compiler/container/build.gradle.kts
+++ b/compiler/container/build.gradle.kts
@@ -24,7 +24,6 @@ sourceSets {
 testsJar {}
 
 projectTest {
-    shouldRunAfter(":dist")
-    dependsOn(":prepare:mock-runtime-for-test:dist")
+    dependsOn(":dist")
     workingDir = rootDir
 }
diff --git a/compiler/tests-java8/build.gradle.kts b/compiler/tests-java8/build.gradle.kts
index 5fba3e7bc1e..6d90bae33c7 100644
--- a/compiler/tests-java8/build.gradle.kts
+++ b/compiler/tests-java8/build.gradle.kts
@@ -22,8 +22,7 @@ tasks.withType<KotlinCompile> {
 
 projectTest {
     executable = "${rootProject.extra["JDK_18"]!!}/bin/java"
-    shouldRunAfter(":dist")
-    dependsOn(":prepare:mock-runtime-for-test:dist")
+    dependsOn(":dist")
     workingDir = rootDir
     systemProperty("kotlin.test.script.classpath", the<JavaPluginConvention>().sourceSets.getByName("test").output.classesDirs.joinToString(File.pathSeparator))
 }
diff --git a/eval4j/build.gradle.kts b/eval4j/build.gradle.kts
index daefe4e55c4..abdebd06eab 100644
--- a/eval4j/build.gradle.kts
+++ b/eval4j/build.gradle.kts
@@ -17,6 +17,6 @@ sourceSets {
 }
 
 projectTest {
-    shouldRunAfter(":dist")
+    dependsOn(":dist")
     workingDir = rootDir
 }
diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts
index 9071f76d80c..3655b5e68cf 100644
--- a/idea/build.gradle.kts
+++ b/idea/build.gradle.kts
@@ -118,7 +118,7 @@ sourceSets {
 }
 
 projectTest {
-    shouldRunAfter(":dist")
+    dependsOn(":dist")
     workingDir = rootDir
     doFirst {
         systemProperty("idea.home.path", intellijRootDir().canonicalPath)
diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts
index c2cb4a84998..7ad5a3af885 100644
--- a/j2k/build.gradle.kts
+++ b/j2k/build.gradle.kts
@@ -46,7 +46,7 @@ sourceSets {
 }
 
 projectTest {
-    shouldRunAfter(":dist")
+    dependsOn(":dist")
     workingDir = rootDir
     doFirst {
         systemProperty("idea.home.path", intellijRootDir().canonicalPath)
diff --git a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts
index 1a7cdffbcef..ff9790ec471 100644
--- a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts
+++ b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts
@@ -52,7 +52,7 @@ evaluationDependsOn(":kotlin-android-extensions-runtime")
 
 projectTest {
     environment("ANDROID_EXTENSIONS_RUNTIME_CLASSES", getSourceSetsFrom(":kotlin-android-extensions-runtime")["main"].output.classesDirs.asPath)
-    shouldRunAfter(":dist")
+    dependsOn(":dist")
     workingDir = rootDir
     doFirst {
         val androidPluginPath = File(intellijRootDir(), "plugins/android").canonicalPath
diff --git a/plugins/kapt3/kapt3-compiler/build.gradle.kts b/plugins/kapt3/kapt3-compiler/build.gradle.kts
index ed7ea8b391b..13e8f7b5deb 100644
--- a/plugins/kapt3/kapt3-compiler/build.gradle.kts
+++ b/plugins/kapt3/kapt3-compiler/build.gradle.kts
@@ -37,7 +37,7 @@ testsJar {}
 
 projectTest {
     workingDir = rootDir
-    shouldRunAfter(":dist")
+    dependsOn(":dist")
 }
 
 runtimeJar()
diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts
index 66bdf621b80..7e21ba065bf 100644
--- a/prepare/idea-plugin/build.gradle.kts
+++ b/prepare/idea-plugin/build.gradle.kts
@@ -87,7 +87,7 @@ val jar = runtimeJar(task<ShadowJar>("shadowJar")) {
 }
 
 ideaPlugin {
-    shouldRunAfter(":dist")
+    dependsOn(":dist")
     from(jar)
     from(sideJars)
 }
diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts
index a85c123c8ca..97850f589bc 100644
--- a/ultimate/build.gradle.kts
+++ b/ultimate/build.gradle.kts
@@ -175,8 +175,7 @@ val ideaPluginDir: File by rootProject.extra
 val ideaUltimatePluginDir: File by rootProject.extra
 
 task<Copy>("ideaUltimatePlugin") {
-    dependsOn("$communityPluginProject:ideaPlugin")
-    shouldRunAfter(":ideaPlugin")
+    dependsOn(":ideaPlugin")
     into(ideaUltimatePluginDir)
     from(ideaPluginDir) { exclude("lib/kotlin-plugin.jar") }
     from(jar, { into("lib") })