diff --git a/build-logic/convention/src/main/kotlin/KmpLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/KmpLibraryConventionPlugin.kt
index 7710ff73a..bb8adccdd 100644
--- a/build-logic/convention/src/main/kotlin/KmpLibraryConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/KmpLibraryConventionPlugin.kt
@@ -19,9 +19,11 @@ import com.google.samples.apps.nowinandroid.configureFlavors
 import com.google.samples.apps.nowinandroid.configureGradleManagedDevices
 import com.google.samples.apps.nowinandroid.configureKotlinAndroid
 import com.google.samples.apps.nowinandroid.configureKotlinMultiplatform
+import com.google.samples.apps.nowinandroid.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
 
 class KmpLibraryConventionPlugin: Plugin<Project> {
     override fun apply(target: Project) {
@@ -38,6 +40,11 @@ class KmpLibraryConventionPlugin: Plugin<Project> {
                 // so resources inside ":core:module1" must be prefixed with "core_module1_"
                 resourcePrefix = path.split("""\W""".toRegex()).drop(1).distinct().joinToString(separator = "_").lowercase() + "_"
             }
+            dependencies {
+                add("commonTestImplementation", libs.findLibrary("kotlin.test").get())
+                add("commonTestImplementation", libs.findLibrary("turbine").get())
+                add("commonTestImplementation", libs.findLibrary("kotlinx.coroutines.test").get())
+            }
         }
     }
 }
diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts
index 56a6fd958..008fcc02c 100644
--- a/core/common/build.gradle.kts
+++ b/core/common/build.gradle.kts
@@ -29,10 +29,5 @@ kotlin {
             api(libs.logging)
             implementation(libs.kotlinx.coroutines.core)
         }
-        commonTest.dependencies {
-            implementation(libs.kotlin.test)
-            implementation(libs.turbine)
-            implementation(libs.kotlinx.coroutines.test)
-        }
     }
 }
diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts
index 0d21ea909..9ce32bc8a 100644
--- a/core/data/build.gradle.kts
+++ b/core/data/build.gradle.kts
@@ -43,7 +43,6 @@ kotlin {
         }
 
         commonTest.dependencies {
-            implementation(libs.kotlin.test)
             implementation(libs.kotlinx.coroutines.test)
             implementation(libs.kotlinx.serialization.json)
 //            implementation(projects.core.datastoreTest)
diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts
index faf1fc3c3..f7eda81de 100644
--- a/core/database/build.gradle.kts
+++ b/core/database/build.gradle.kts
@@ -57,10 +57,6 @@ kotlin {
 //            implementation(npm("sql.js", "1.8.0"))
 //            implementation(devNpm("copy-webpack-plugin", "9.1.0"))
 //        }
-        commonTest.dependencies {
-            implementation(libs.kotlin.test)
-            implementation(libs.kotlinx.coroutines.test)
-        }
     }
 }
 
diff --git a/core/datastore/build.gradle.kts b/core/datastore/build.gradle.kts
index 883b16025..ffa4331da 100644
--- a/core/datastore/build.gradle.kts
+++ b/core/datastore/build.gradle.kts
@@ -45,8 +45,6 @@ kotlin {
             implementation(projects.core.datastoreProto)
         }
         commonTest.dependencies {
-            implementation(libs.kotlin.test)
-            implementation(libs.kotlinx.coroutines.test)
             implementation(libs.multiplatform.settings.test)
         }
     }
diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts
index 59862be9a..9dff86db8 100644
--- a/core/designsystem/build.gradle.kts
+++ b/core/designsystem/build.gradle.kts
@@ -49,10 +49,6 @@ kotlin {
             implementation(compose.components.resources)
             implementation(compose.components.uiToolingPreview)
         }
-        commonTest.dependencies {
-            implementation(libs.kotlin.test)
-
-        }
     }
 }
 dependencies {
diff --git a/core/model/build.gradle.kts b/core/model/build.gradle.kts
index 0cba90bc7..75a15d512 100644
--- a/core/model/build.gradle.kts
+++ b/core/model/build.gradle.kts
@@ -27,8 +27,5 @@ kotlin {
         commonMain.dependencies {
             api(libs.kotlinx.datetime)
         }
-        commonTest.dependencies {
-            implementation(libs.kotlin.test)
-        }
     }
 }
diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
index 24aa870d7..fd690441a 100644
--- a/core/network/build.gradle.kts
+++ b/core/network/build.gradle.kts
@@ -66,10 +66,6 @@ kotlin {
             implementation(libs.ktor.serialization.kotlinx.json)
             implementation(libs.ktorfit.lib)
         }
-        commonTest.dependencies {
-            implementation(libs.kotlin.test)
-            implementation(libs.kotlinx.coroutines.test)
-        }
         androidMain.dependencies {
             implementation(libs.ktor.client.android)
         }