diff --git a/build-logic/convention/src/main/java/UnittoLibraryComposePlugin.kt b/build-logic/convention/src/main/java/UnittoLibraryComposePlugin.kt
index 0602434f..26c40976 100644
--- a/build-logic/convention/src/main/java/UnittoLibraryComposePlugin.kt
+++ b/build-logic/convention/src/main/java/UnittoLibraryComposePlugin.kt
@@ -41,6 +41,9 @@ class UnittoLibraryComposePlugin : Plugin<Project> {
                 "implementation"(libs.findLibrary("androidx.compose.material.icons.extended").get())
                 "implementation"(libs.findLibrary("androidx.compose.ui.tooling").get())
                 "implementation"(libs.findLibrary("androidx.compose.ui.tooling.preview").get())
+
+                "androidTestImplementation"(libs.findLibrary("androidx.compose.ui.test.junit4").get())
+                "debugImplementation"(libs.findLibrary("androidx.compose.ui.test.manifest").get())
             }
         }
     }
diff --git a/build-logic/convention/src/main/java/UnittoLibraryPlugin.kt b/build-logic/convention/src/main/java/UnittoLibraryPlugin.kt
index f06714f3..52aa472c 100644
--- a/build-logic/convention/src/main/java/UnittoLibraryPlugin.kt
+++ b/build-logic/convention/src/main/java/UnittoLibraryPlugin.kt
@@ -37,6 +37,7 @@ class UnittoLibraryPlugin : Plugin<Project> {
             extensions.configure<LibraryExtension> {
                 configureKotlinAndroid(this)
                 defaultConfig.minSdk = 21
+                defaultConfig.targetSdk = 34 // Android test uses minSdk instead of target sdk for some reason
                 defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
                 defaultConfig.consumerProguardFiles("consumer-rules.pro")
             }
@@ -44,6 +45,12 @@ class UnittoLibraryPlugin : Plugin<Project> {
             val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
             dependencies {
                 "implementation"(libs.findLibrary("androidx.core.core.ktx").get())
+
+                "testImplementation"(libs.findLibrary("junit.junit").get())
+
+                "androidTestImplementation"(libs.findLibrary("androidx.test.core").get())
+                "androidTestImplementation"(libs.findLibrary("androidx.test.ext.junit.ktx").get())
+                "androidTestImplementation"(libs.findLibrary("androidx.test.runner").get())
             }
         }
     }
diff --git a/core/base/build.gradle.kts b/core/base/build.gradle.kts
index 020b6be5..4ce1f673 100644
--- a/core/base/build.gradle.kts
+++ b/core/base/build.gradle.kts
@@ -57,7 +57,3 @@ fun com.android.build.api.dsl.VariantDimension.storeLink(url: String) {
         "\"${url}\""
     )
 }
-
-dependencies {
-    testImplementation(libs.junit.junit)
-}
diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
index 39ae1fa4..a46a9bb2 100644
--- a/core/ui/build.gradle.kts
+++ b/core/ui/build.gradle.kts
@@ -31,10 +31,7 @@ android {
 }
 
 dependencies {
-    testImplementation(libs.junit.junit)
     testImplementation(libs.org.robolectric.robolectric)
-    androidTestImplementation(libs.androidx.compose.ui.test.junit4)
-    debugImplementation(libs.androidx.compose.ui.test.manifest)
 
     implementation(libs.androidx.navigation.navigation.compose)
     implementation(libs.androidx.browser.browser)
diff --git a/data/common/build.gradle.kts b/data/common/build.gradle.kts
index 7d378bc3..6f5dad9a 100644
--- a/data/common/build.gradle.kts
+++ b/data/common/build.gradle.kts
@@ -28,6 +28,6 @@ android {
 dependencies {
     implementation(libs.androidx.core.core.ktx)
     implementation(libs.androidx.lifecycle.lifecycle.runtime.compose)
+
     implementation(project(":core:base"))
-    testImplementation(libs.junit.junit)
 }
\ No newline at end of file
diff --git a/data/evaluatto/build.gradle.kts b/data/evaluatto/build.gradle.kts
index e4ea4267..5d504462 100644
--- a/data/evaluatto/build.gradle.kts
+++ b/data/evaluatto/build.gradle.kts
@@ -28,5 +28,4 @@ android {
 
 dependencies {
     implementation(project(":core:base"))
-    testImplementation(libs.junit.junit)
 }
diff --git a/data/units/build.gradle.kts b/data/units/build.gradle.kts
index 757e87c4..05c0f66e 100644
--- a/data/units/build.gradle.kts
+++ b/data/units/build.gradle.kts
@@ -36,7 +36,6 @@ android {
 }
 
 dependencies {
-    testImplementation(libs.junit.junit)
     testImplementation(libs.org.robolectric.robolectric)
 
     implementation(libs.androidx.lifecycle.lifecycle.runtime.compose)
diff --git a/feature/calculator/build.gradle.kts b/feature/calculator/build.gradle.kts
index b46d6e47..5aec6b54 100644
--- a/feature/calculator/build.gradle.kts
+++ b/feature/calculator/build.gradle.kts
@@ -30,11 +30,8 @@ android {
 }
 
 dependencies {
-    testImplementation(libs.junit.junit)
     testImplementation(libs.org.robolectric.robolectric)
     testImplementation(libs.org.jetbrains.kotlinx.kotlinx.coroutines.test)
-    androidTestImplementation(libs.androidx.compose.ui.test.junit4)
-    debugImplementation(libs.androidx.compose.ui.test.manifest)
 
     implementation(project(":data:common"))
     implementation(project(":data:database"))
diff --git a/feature/converter/build.gradle.kts b/feature/converter/build.gradle.kts
index 03d36bf3..703dc6be 100644
--- a/feature/converter/build.gradle.kts
+++ b/feature/converter/build.gradle.kts
@@ -32,7 +32,6 @@ android {
 }
 
 dependencies {
-    testImplementation(libs.junit.junit)
     testImplementation(libs.org.robolectric.robolectric)
     testImplementation(libs.org.jetbrains.kotlinx.kotlinx.coroutines.test)
     testImplementation(libs.androidx.room.runtime)
diff --git a/feature/datecalculator/build.gradle.kts b/feature/datecalculator/build.gradle.kts
index 60f20cae..adf07f13 100644
--- a/feature/datecalculator/build.gradle.kts
+++ b/feature/datecalculator/build.gradle.kts
@@ -29,8 +29,6 @@ android {
 }
 
 dependencies {
-    testImplementation(libs.junit.junit)
-
     implementation(project(":data:common"))
     implementation(project(":data:model"))
     implementation(project(":data:userprefs"))
diff --git a/feature/timezone/build.gradle.kts b/feature/timezone/build.gradle.kts
index 1c5a5006..f5cc505a 100644
--- a/feature/timezone/build.gradle.kts
+++ b/feature/timezone/build.gradle.kts
@@ -29,10 +29,8 @@ android {
 }
 
 dependencies {
-    testImplementation(libs.junit.junit)
     testImplementation(libs.org.robolectric.robolectric)
-    androidTestImplementation(libs.androidx.compose.ui.test.junit4)
-    debugImplementation(libs.androidx.compose.ui.test.manifest)
+
     implementation(libs.com.github.sadellie.themmo)
     implementation(libs.org.burnoutcrew.composereorderable.reorderable)
     implementation(libs.androidx.appcompat.appcompat)