diff --git a/libraries/kotlin.test/build.gradle.kts b/libraries/kotlin.test/build.gradle.kts
index 2ffadcf97c0..354125f286a 100644
--- a/libraries/kotlin.test/build.gradle.kts
+++ b/libraries/kotlin.test/build.gradle.kts
@@ -338,7 +338,6 @@ publishing {
         create("main", MavenPublication::class) {
             from(rootComponent)
             artifact(combinedSourcesJar)
-            artifact(emptyJavadocJar)
             // Remove all optional dependencies from the root pom
             pom.withXml {
                 val dependenciesNode = (asNode().get("dependencies") as NodeList).filterIsInstance<Node>().single()
@@ -355,7 +354,6 @@ publishing {
                 artifactId = "kotlin-test-$framework"
                 from(components[framework])
                 artifact(tasks.getByPath(":kotlin-test:kotlin-test-$framework:sourcesJar") as Jar)
-                artifact(emptyJavadocJar)
                 configureKotlinPomAttributes(project, "Kotlin Test Support for $framework")
                 suppressAllPomMetadataWarnings()
             }
@@ -364,30 +362,29 @@ publishing {
             artifactId = "kotlin-test-js"
             from(jsComponent)
             artifact(tasks.getByPath(":kotlin-test:kotlin-test-js:sourcesJar") as Jar)
-            artifact(emptyJavadocJar)
             configureKotlinPomAttributes(project, "Kotlin Test for JS")
         }
         create("wasm", MavenPublication::class) {
             artifactId = "kotlin-test-wasm"
             from(wasmComponent)
             artifact(tasks.getByPath(":kotlin-test:kotlin-test-wasm:sourcesJar") as Jar)
-            artifact(emptyJavadocJar)
             configureKotlinPomAttributes(project, "Kotlin Test for WASM", packaging = "klib")
         }
         create("common", MavenPublication::class) {
             artifactId = "kotlin-test-common"
             from(commonMetadataComponent)
             artifact(tasks.getByPath(":kotlin-test:kotlin-test-common:sourcesJar") as Jar)
-            artifact(emptyJavadocJar)
             configureKotlinPomAttributes(project, "Kotlin Test Common")
         }
         create("annotationsCommon", MavenPublication::class) {
             artifactId = "kotlin-test-annotations-common"
             from(annotationsMetadataComponent)
             artifact(tasks.getByPath(":kotlin-test:kotlin-test-annotations-common:sourcesJar") as Jar)
-            artifact(emptyJavadocJar)
             configureKotlinPomAttributes(project, "Kotlin Test Common")
         }
+        withType<MavenPublication> {
+            artifact(emptyJavadocJar)
+        }
     }
 }