diff --git a/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/deps.ext.kt b/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/deps.ext.kt
index aa9d05e8..8d855dda 100644
--- a/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/deps.ext.kt
+++ b/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/deps.ext.kt
@@ -19,7 +19,9 @@ fun DependencyHandlerScope.addTestDependencies(project: Project) {
   arrayOf("test", "androidTest", "screenshotTest")
     .filter { sourceSet -> project.configurations.findByName("${sourceSet}Implementation") != null }
     .forEach { sourceSet ->
+      addProvider("${sourceSet}Implementation", platform(libs.junit.bom))
       addProvider("${sourceSet}Implementation", libs.junit.jupiter.api)
+      addProviderConvertible("${sourceSet}Implementation", libs.junit.jupiter)
       addProvider<MinimalExternalModuleDependency, ExternalModuleDependency>(
         "${sourceSet}Implementation",
         libs.truth,
@@ -27,6 +29,7 @@ fun DependencyHandlerScope.addTestDependencies(project: Project) {
         exclude(group = "junit", module = "junit")
       }
       addProvider("${sourceSet}RuntimeOnly", libs.junit.jupiter.engine)
+      addProvider("${sourceSet}RuntimeOnly", libs.junit.platform.launcher)
       addProvider<MinimalExternalModuleDependency, ExternalModuleDependency>(
         "${sourceSet}RuntimeOnly",
         libs.junit.legacy,
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d52e2af9..d8111a84 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -82,8 +82,11 @@ haze-materials = { module = "dev.chrisbanes.haze:haze-materials", version.ref =
 htmlconverter = "be.digitalia.compose.htmlconverter:htmlconverter:1.0.4"
 javax-inject = "javax.inject:javax.inject:1"
 jsoup = "org.jsoup:jsoup:1.20.1"
-junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
-junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
+junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
+junit-jupiter = { module = "org.junit.jupiter:junit-jupiter" }
+junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api" }
+junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine" }
+junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher" }
 junit-legacy = "junit:junit:4.13.2"
 konvert-annotations = { module = "io.mcarle:konvert-annotations", version.ref = "konvert" }
 konvert-api = { module = "io.mcarle:konvert-api", version.ref = "konvert" }