diff --git a/build.gradle.kts b/build.gradle.kts
index 5c0093bdb1..b702669332 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -55,15 +55,14 @@ subprojects {
         val dokkaOutputDir = "$buildDir/dokka"
 
         dokkaHtml {
+            onlyIf { !isLocalPublication }
             outputDirectory.set(file(dokkaOutputDir))
         }
 
         register<Jar>("javadocJar") {
             archiveClassifier.set("javadoc")
-            if (!isLocalPublication) {
-                dependsOn(dokkaHtml)
-                from(dokkaOutputDir)
-            }
+            dependsOn(dokkaHtml)
+            from(dokkaOutputDir)
         }
     }
 }
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/taskUtils.kt b/buildSrc/src/main/kotlin/org/jetbrains/taskUtils.kt
index 46bf29ff5e..026a5c07cb 100644
--- a/buildSrc/src/main/kotlin/org/jetbrains/taskUtils.kt
+++ b/buildSrc/src/main/kotlin/org/jetbrains/taskUtils.kt
@@ -14,4 +14,9 @@ fun Task.dependsOnMavenLocalPublication() {
 }
 
 val Project.isLocalPublication: Boolean
-    get() = gradle.startParameter.taskNames.contains("publishToMavenLocal")
+    get() = gradle.startParameter.taskNames.any {
+        it.equals("publishToMavenLocal", ignoreCase = true) ||
+                it.equals("integrationTest", ignoreCase = true) ||
+                it.equals("check", ignoreCase = true) ||
+                it.equals("test", ignoreCase = true)
+    }