diff --git a/api/build.gradle.kts b/api/build.gradle.kts
index 0b97b7d6..16e5df8d 100644
--- a/api/build.gradle.kts
+++ b/api/build.gradle.kts
@@ -9,6 +9,6 @@ dependencies {
   ksp(Dependencies.ThirdParty.Moshi.ksp)
   implementation(Dependencies.ThirdParty.Retrofit.moshi)
   testImplementation(Dependencies.Kotlin.Coroutines.core)
-  testImplementation(Dependencies.Testing.junit)
+  testImplementation(kotlin("test-junit"))
   testImplementation(Dependencies.Testing.mockWebServer)
 }
diff --git a/api/src/test/java/dev/msfjarvis/lobsters/data/api/LobstersApiTest.kt b/api/src/test/java/dev/msfjarvis/lobsters/data/api/LobstersApiTest.kt
index 81e23c5b..cb867b91 100644
--- a/api/src/test/java/dev/msfjarvis/lobsters/data/api/LobstersApiTest.kt
+++ b/api/src/test/java/dev/msfjarvis/lobsters/data/api/LobstersApiTest.kt
@@ -2,6 +2,9 @@ package dev.msfjarvis.lobsters.data.api
 
 import com.squareup.moshi.Moshi
 import dev.msfjarvis.lobsters.util.TestUtils
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
 import kotlinx.coroutines.runBlocking
 import mockwebserver3.Dispatcher
 import mockwebserver3.MockResponse
@@ -9,10 +12,7 @@ import mockwebserver3.MockWebServer
 import mockwebserver3.RecordedRequest
 import okhttp3.OkHttpClient
 import org.junit.AfterClass
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
 import org.junit.BeforeClass
-import org.junit.Test
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
 import retrofit2.create
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index cb6c63c4..99a3dc2e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -47,6 +47,6 @@ dependencies {
   implementation(Dependencies.ThirdParty.pullToRefresh)
   implementation(Dependencies.ThirdParty.Retrofit.moshi)
   implementation(Dependencies.ThirdParty.SQLDelight.androidDriver)
-  testImplementation(Dependencies.Testing.junit)
-  androidTestImplementation(Dependencies.AndroidX.Compose.activity)
+  testImplementation(kotlin("test-junit"))
+  androidTestImplementation(kotlin("test-junit"))
 }
diff --git a/app/src/androidTest/java/dev/msfjarvis/lobsters/ui/navigation/LobstersBottomNavTest.kt b/app/src/androidTest/java/dev/msfjarvis/lobsters/ui/navigation/LobstersBottomNavTest.kt
index 6860b3db..abd2c048 100644
--- a/app/src/androidTest/java/dev/msfjarvis/lobsters/ui/navigation/LobstersBottomNavTest.kt
+++ b/app/src/androidTest/java/dev/msfjarvis/lobsters/ui/navigation/LobstersBottomNavTest.kt
@@ -15,8 +15,8 @@ import com.karumi.shot.ScreenshotTest
 import dev.msfjarvis.lobsters.ui.DarkTestTheme
 import dev.msfjarvis.lobsters.ui.main.LobstersBottomNav
 import dev.msfjarvis.lobsters.ui.theme.LobstersTheme
+import kotlin.test.Test
 import org.junit.Rule
-import org.junit.Test
 
 class LobstersBottomNavTest : ScreenshotTest {
 
diff --git a/app/src/androidTest/java/dev/msfjarvis/lobsters/ui/posts/HeaderTest.kt b/app/src/androidTest/java/dev/msfjarvis/lobsters/ui/posts/HeaderTest.kt
index 6fc09cd2..0ee67183 100644
--- a/app/src/androidTest/java/dev/msfjarvis/lobsters/ui/posts/HeaderTest.kt
+++ b/app/src/androidTest/java/dev/msfjarvis/lobsters/ui/posts/HeaderTest.kt
@@ -13,8 +13,8 @@ import androidx.compose.ui.test.onRoot
 import com.karumi.shot.ScreenshotTest
 import dev.msfjarvis.lobsters.ui.DarkTestTheme
 import java.time.Month
+import kotlin.test.Test
 import org.junit.Rule
-import org.junit.Test
 
 class HeaderTest : ScreenshotTest {
   @get:Rule
diff --git a/app/src/androidTest/java/dev/msfjarvis/lobsters/ui/posts/LobstersItemTest.kt b/app/src/androidTest/java/dev/msfjarvis/lobsters/ui/posts/LobstersItemTest.kt
index f14380eb..b4f0ee0a 100644
--- a/app/src/androidTest/java/dev/msfjarvis/lobsters/ui/posts/LobstersItemTest.kt
+++ b/app/src/androidTest/java/dev/msfjarvis/lobsters/ui/posts/LobstersItemTest.kt
@@ -6,8 +6,8 @@ import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onRoot
 import com.karumi.shot.ScreenshotTest
 import dev.msfjarvis.lobsters.ui.DarkTestTheme
+import kotlin.test.Test
 import org.junit.Rule
-import org.junit.Test
 
 class LobstersItemTest : ScreenshotTest {
 
diff --git a/app/src/test/java/dev/msfjarvis/lobsters/util/DateExtensionsTest.kt b/app/src/test/java/dev/msfjarvis/lobsters/util/DateExtensionsTest.kt
index 1a649f1b..cc897505 100644
--- a/app/src/test/java/dev/msfjarvis/lobsters/util/DateExtensionsTest.kt
+++ b/app/src/test/java/dev/msfjarvis/lobsters/util/DateExtensionsTest.kt
@@ -1,8 +1,8 @@
 package dev.msfjarvis.lobsters.util
 
 import java.time.Month
-import org.junit.Assert.*
-import org.junit.Test
+import kotlin.test.Test
+import kotlin.test.assertEquals
 
 class DateExtensionsTest {
   @Test
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 91209bc4..e511f038 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -94,7 +94,6 @@ object Dependencies {
 
   object Testing {
 
-    const val junit = "junit:junit:4.13.2"
     const val mockWebServer = "com.squareup.okhttp3:mockwebserver3-junit4:5.0.0-alpha.2"
   }
 }
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index dbdc7ce6..1e0a7e44 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -44,5 +44,28 @@ kotlin {
         implementation(compose.runtime)
       }
     }
+
+    val androidTest by getting {
+      dependencies {
+        implementation(kotlin("test-junit"))
+      }
+    }
+
+    val jvmTest by getting {
+      dependencies {
+        implementation(kotlin("test-junit"))
+      }
+    }
+
+    val commonTest by getting {
+      dependencies {
+        implementation(kotlin("test-common"))
+        implementation(kotlin("test-annotations-common"))
+      }
+    }
   }
 }
+
+android {
+  sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
+}
diff --git a/common/src/main/AndroidManifest.xml b/common/src/androidMain/AndroidManifest.xml
similarity index 100%
rename from common/src/main/AndroidManifest.xml
rename to common/src/androidMain/AndroidManifest.xml
diff --git a/database/build.gradle.kts b/database/build.gradle.kts
index e4a4ed55..daaf6ca9 100644
--- a/database/build.gradle.kts
+++ b/database/build.gradle.kts
@@ -7,5 +7,5 @@ plugins {
 dependencies {
   testImplementation(Dependencies.Kotlin.Coroutines.core)
   testImplementation(Dependencies.ThirdParty.SQLDelight.jvmDriver)
-  testImplementation(Dependencies.Testing.junit)
+  testImplementation(kotlin("test-junit"))
 }
diff --git a/database/src/test/java/dev/msfjarvis/lobsters/data/local/SqlDelightQueriesTest.kt b/database/src/test/java/dev/msfjarvis/lobsters/data/local/SqlDelightQueriesTest.kt
index 43daf226..79cbc1d6 100644
--- a/database/src/test/java/dev/msfjarvis/lobsters/data/local/SqlDelightQueriesTest.kt
+++ b/database/src/test/java/dev/msfjarvis/lobsters/data/local/SqlDelightQueriesTest.kt
@@ -3,10 +3,10 @@ package dev.msfjarvis.lobsters.data.local
 import com.squareup.sqldelight.sqlite.driver.JdbcSqliteDriver
 import dev.msfjarvis.lobsters.database.LobstersDatabase
 import dev.msfjarvis.lobsters.model.TagsAdapter
+import kotlin.test.Test
+import kotlin.test.assertEquals
 import kotlinx.coroutines.runBlocking
-import org.junit.Assert.assertEquals
 import org.junit.Before
-import org.junit.Test
 
 @OptIn(ExperimentalStdlibApi::class)
 class SqlDelightQueriesTest {