diff --git a/buildSrc/src/main/kotlin/artifacts.kt b/buildSrc/src/main/kotlin/artifacts.kt
index d4b20f92ada..a7776044334 100644
--- a/buildSrc/src/main/kotlin/artifacts.kt
+++ b/buildSrc/src/main/kotlin/artifacts.kt
@@ -205,7 +205,7 @@ fun Project.standardPublicJars() {
     javadocJar()
 }
 
-fun Project.publish(moduleMetadata: Boolean = false) {
+fun Project.publish(moduleMetadata: Boolean = false, configure: MavenPublication.() -> Unit = { }) {
     apply<MavenPublishPlugin>()
     apply<SigningPlugin>()
 
@@ -245,8 +245,6 @@ fun Project.publish(moduleMetadata: Boolean = false) {
             create<MavenPublication>("Main") {
                 if (javaComponent != null) {
                     from(javaComponent)
-                } else {
-                    artifact(tasks["jar"])
                 }
 
                 pom {
@@ -272,6 +270,8 @@ fun Project.publish(moduleMetadata: Boolean = false) {
                         }
                     }
                 }
+
+                configure()
             }
         }
 
diff --git a/libraries/kotlin.test/js/build.gradle b/libraries/kotlin.test/js/build.gradle
index c26de1f6253..e83488eaf5d 100644
--- a/libraries/kotlin.test/js/build.gradle
+++ b/libraries/kotlin.test/js/build.gradle
@@ -80,10 +80,11 @@ artifacts {
     archives libraryJarWithIr
     distLibrary libraryJarWithIr
     archives sourcesJar
-    sources sourcesJar
     distJs(file(compileKotlin2Js.kotlinOptions.outputFile)) {
         builtBy(compileKotlin2Js)
     }
 }
 
+configureSourcesJar()
+
 configureJavadocJar()
diff --git a/libraries/kotlin.test/jvm/build.gradle b/libraries/kotlin.test/jvm/build.gradle
index 21b55e9e848..fe4ba8f1dfe 100644
--- a/libraries/kotlin.test/jvm/build.gradle
+++ b/libraries/kotlin.test/jvm/build.gradle
@@ -2,9 +2,13 @@ description = 'Kotlin Test'
 
 apply plugin: 'kotlin-platform-jvm'
 
+archivesBaseName = 'kotlin-test'
+
 configureJvm6Project(project)
-// TODO: Migrate to maven-publish publishing
-configureLegacyPublishing(project)
+
+configurePublishing(project) {
+    artifactId = archivesBaseName
+}
 
 def includeJava9 = BuildPropertiesExtKt.getIncludeJava9(project.kotlinBuildProperties)
 
@@ -21,8 +25,6 @@ dependencies {
     testCompile('junit:junit:4.12')
 }
 
-archivesBaseName = 'kotlin-test'
-
 jar {
     manifestAttributes(manifest, project, 'Test', true)
     if (includeJava9) {
@@ -30,19 +32,14 @@ jar {
     }
 }
 
-task modularJar(type: Jar) {
+configureModularJar {
     dependsOn(jar)
     manifestAttributes(manifest, project, 'Test', true)
-    classifier = 'modular'
 
     from zipTree(jar.outputs.files.singleFile)
 }
 
-artifacts {
-    archives sourcesJar
-    sources sourcesJar
-    archives modularJar
-}
+configureSourcesJar()
 
 configureJavadocJar()