diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/PreHmppDependenciesDeprecationIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/PreHmppDependenciesDeprecationIT.kt
index 26618ac8ad7..49321e4219e 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/PreHmppDependenciesDeprecationIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/PreHmppDependenciesDeprecationIT.kt
@@ -62,33 +62,28 @@ class PreHmppDependenciesDeprecationIT : KGPBaseTest() {
 
     @GradleTest
     fun testNoWarningsOnProjectDependencies(gradleVersion: GradleVersion) {
-        checkDiagnostics(gradleVersion, "noWarningsOnProjectDependencies", taskToCall = ":consumer:dependencies")
+        checkDiagnostics(gradleVersion, "noWarningsOnProjectDependencies", projectPathToCheck = ":consumer")
     }
 
     @GradleTest
-    fun testNoWarningsInPlatformSpecificSourceSets(gradleVersion: GradleVersion) {
-        checkDiagnostics(gradleVersion, "noWarningsInPlatformSpecificSourceSets")
-    }
-
-    @GradleTest
-    fun testNoWarningsInPreHmppProjects(gradleVersion: GradleVersion, @TempDir tempDir: Path) {
+    fun testNoWarningsInPlatformSpecificSourceSets(gradleVersion: GradleVersion, @TempDir tempDir: Path) {
         publishLibrary("preHmppLibrary", gradleVersion, tempDir)
-        checkDiagnostics(gradleVersion, "simpleReport", tempDir) {
-            gradleProperties.writeText("kotlin.internal.mpp.hierarchicalStructureByDefault=false")
-        }
+        checkDiagnostics(gradleVersion, "noWarningsInPlatformSpecificSourceSets", tempDir)
     }
 
     private fun checkDiagnostics(
         gradleVersion: GradleVersion,
         projectName: String,
         tempDir: Path? = null,
-        taskToCall: String = "dependencies",
+        projectPathToCheck: String = "", // empty means rootProject
         expectReportForDependency: String? = null,
         preBuildAction: TestProject.() -> Unit = {}
     ) {
         project("preHmppDependenciesDeprecation/$projectName", gradleVersion, localRepoDir = tempDir?.resolve("repo")) {
             preBuildAction()
-            build(taskToCall) {
+            build("$projectPathToCheck:dependencies") {
+                // all dependencies should be resolved, Gradle won't fail the 'dependencies' task on its own
+                assertOutputDoesNotContain("FAILED")
                 if (expectReportForDependency != null) {
                     output.assertHasDiagnostic(
                         KotlinToolingDiagnostics.PreHmppDependenciesUsedInBuild
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/preHmppDependenciesDeprecation/noWarningsInPlatformSpecificSourceSets/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/preHmppDependenciesDeprecation/noWarningsInPlatformSpecificSourceSets/build.gradle.kts
index 87cdec4a097..80cb0939615 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/preHmppDependenciesDeprecation/noWarningsInPlatformSpecificSourceSets/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/preHmppDependenciesDeprecation/noWarningsInPlatformSpecificSourceSets/build.gradle.kts
@@ -1,17 +1,13 @@
 plugins {
     kotlin("multiplatform")
-    id("maven-publish")
 }
 
-publishing {
-    repositories {
-        maven("<localRepo>")
-    }
+repositories {
+    mavenCentral()
+    mavenLocal()
+    maven("<localRepo>")
 }
 
-group = "org.jetbrains.kotlin.tests"
-version = "0.1"
-
 kotlin {
     jvm()
     js()
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/preHmppDependenciesDeprecation/noWarningsOnPopularDependencies/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/preHmppDependenciesDeprecation/noWarningsOnPopularDependencies/build.gradle.kts
index 59bef0d6a33..d0fd2d40128 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/preHmppDependenciesDeprecation/noWarningsOnPopularDependencies/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/preHmppDependenciesDeprecation/noWarningsOnPopularDependencies/build.gradle.kts
@@ -8,13 +8,21 @@ repositories {
 }
 
 kotlin {
-    jvm()
+    jvm() {
+        testRuns.named("test") {
+            executionTask.configure {
+                useJUnitPlatform()
+            }
+        }
+    }
     linuxX64()
 
     sourceSets.getByName("commonMain").dependencies {
         implementation(kotlin("stdlib"))
-        implementation(kotlin("kotlin-test"))
-
         implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
     }
+
+    sourceSets.getByName("commonTest").dependencies {
+        implementation(kotlin("test"))
+    }
 }
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/preHmppDependenciesDeprecation/transitiveDependencyUpgradesVersion/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/preHmppDependenciesDeprecation/transitiveDependencyUpgradesVersion/build.gradle.kts
index 8d28965cfa8..81f31d1ec2d 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/preHmppDependenciesDeprecation/transitiveDependencyUpgradesVersion/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/preHmppDependenciesDeprecation/transitiveDependencyUpgradesVersion/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 repositories {
     mavenLocal()
     maven("<localRepo>")
+    mavenCentral()
 }
 
 kotlin {