diff --git a/buildSrc/src/main/kotlin/kotlin-multiplatform-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-multiplatform-conventions.gradle.kts
index f1845cc640..c016eb7265 100644
--- a/buildSrc/src/main/kotlin/kotlin-multiplatform-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/kotlin-multiplatform-conventions.gradle.kts
@@ -53,7 +53,7 @@ kotlin {
         moduleName = project.name
         nodejs()
         compilations["main"]?.dependencies {
-            api("org.jetbrains.kotlinx:atomicfu-js:${version("atomicfu")}")
+            api("org.jetbrains.kotlinx:atomicfu:${version("atomicfu")}")
         }
     }
     @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
@@ -63,14 +63,14 @@ kotlin {
         moduleName = project.name + "Wasm"
         nodejs()
         compilations["main"]?.dependencies {
-            api("org.jetbrains.kotlinx:atomicfu-wasm-js:${version("atomicfu")}")
+            api("org.jetbrains.kotlinx:atomicfu:${version("atomicfu")}")
         }
     }
     @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
     wasmWasi {
         nodejs()
         compilations["main"]?.dependencies {
-            api("org.jetbrains.kotlinx:atomicfu-wasm-wasi:${version("atomicfu")}")
+            api("org.jetbrains.kotlinx:atomicfu:${version("atomicfu")}")
         }
         compilations.configureEach {
             compileTaskProvider.configure {
@@ -84,8 +84,7 @@ kotlin {
     sourceSets {
         commonTest {
             dependencies {
-                api("org.jetbrains.kotlin:kotlin-test-common:${version("kotlin")}")
-                api("org.jetbrains.kotlin:kotlin-test-annotations-common:${version("kotlin")}")
+                api("org.jetbrains.kotlin:kotlin-test:${version("kotlin")}")
             }
         }
         jvmMain.dependencies {
@@ -94,7 +93,6 @@ kotlin {
             api("org.jetbrains:annotations:23.0.0")
         }
         jvmTest.dependencies {
-            api("org.jetbrains.kotlin:kotlin-test:${version("kotlin")}")
             // Workaround to make addSuppressed work in tests
             api("org.jetbrains.kotlin:kotlin-reflect:${version("kotlin")}")
             api("org.jetbrains.kotlin:kotlin-stdlib-jdk7:${version("kotlin")}")
@@ -106,24 +104,13 @@ kotlin {
             api("org.jetbrains.kotlinx:atomicfu:0.23.1")
         }
         jsMain { }
-        jsTest {
-            dependencies {
-                api("org.jetbrains.kotlin:kotlin-test-js:${version("kotlin")}")
-            }
-        }
         val wasmJsMain by getting {
         }
         val wasmJsTest by getting {
-            dependencies {
-                api("org.jetbrains.kotlin:kotlin-test-wasm-js:${version("kotlin")}")
-            }
         }
         val wasmWasiMain by getting {
         }
         val wasmWasiTest by getting {
-            dependencies {
-                api("org.jetbrains.kotlin:kotlin-test-wasm-wasi:${version("kotlin")}")
-            }
         }
         groupSourceSets("jsAndWasmJsShared", listOf("js", "wasmJs"), emptyList())
         groupSourceSets("jsAndWasmShared", listOf("jsAndWasmJsShared", "wasmWasi"), listOf("common"))
diff --git a/integration-testing/smokeTest/build.gradle.kts b/integration-testing/smokeTest/build.gradle.kts
index 3739c7209e..87c5b80577 100644
--- a/integration-testing/smokeTest/build.gradle.kts
+++ b/integration-testing/smokeTest/build.gradle.kts
@@ -49,17 +49,17 @@ kotlin {
         }
         jsTest {
             dependencies {
-                implementation(kotlin("test-js"))
+                implementation(kotlin("test"))
             }
         }
         wasmJsTest {
             dependencies {
-                implementation(kotlin("test-wasm-js"))
+                implementation(kotlin("test"))
             }
         }
         wasmWasiTest {
             dependencies {
-                implementation(kotlin("test-wasm-wasi"))
+                implementation(kotlin("test"))
             }
         }
         jvmTest {
diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts
index 3461d5292b..792557a294 100644
--- a/test-utils/build.gradle.kts
+++ b/test-utils/build.gradle.kts
@@ -5,29 +5,14 @@
 kotlin {
     sourceSets {
         commonMain.dependencies {
-            api("org.jetbrains.kotlin:kotlin-test-common:${version("kotlin")}")
-            api("org.jetbrains.kotlin:kotlin-test-annotations-common:${version("kotlin")}")
+            api("org.jetbrains.kotlin:kotlin-test:${version("kotlin")}")
         }
         jvmMain.dependencies {
-            api("org.jetbrains.kotlin:kotlin-test:${version("kotlin")}")
             // Workaround to make addSuppressed work in tests
             api("org.jetbrains.kotlin:kotlin-reflect:${version("kotlin")}")
             api("org.jetbrains.kotlin:kotlin-stdlib-jdk7:${version("kotlin")}")
             api("org.jetbrains.kotlin:kotlin-test-junit:${version("kotlin")}")
             api("junit:junit:${version("junit")}")
         }
-        jsMain.dependencies {
-            api("org.jetbrains.kotlin:kotlin-test-js:${version("kotlin")}")
-        }
-        val wasmJsMain by getting {
-            dependencies {
-                api("org.jetbrains.kotlin:kotlin-test-wasm-js:${version("kotlin")}")
-            }
-        }
-        val wasmWasiMain by getting {
-            dependencies {
-                api("org.jetbrains.kotlin:kotlin-test-wasm-wasi:${version("kotlin")}")
-            }
-        }
     }
 }