diff --git a/build.gradle.kts b/build.gradle.kts
index d3d05ef9..25105ea6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -50,7 +50,7 @@ subprojects {
             testCompileOnly("org.jetbrains:annotations:26.0.2")
 
             // tests
-            testImplementation(platform("org.junit:junit-bom:5.14.2"))
+            testImplementation(platform("org.junit:junit-bom:6.0.2"))
             testImplementation(group = "org.junit.jupiter", name = "junit-jupiter")
             testRuntimeOnly(group = "org.junit.jupiter", name = "junit-jupiter-engine")
             testRuntimeOnly(group = "org.junit.platform", name = "junit-platform-launcher")
@@ -105,6 +105,10 @@ subprojects {
                 finalizedBy(jacocoTestReport)
             }
 
+            compileTestJava {
+                options.release = 17 // jdk 17 is baseline for junit v6
+            }
+
             jacocoTestReport {
                 dependsOn(test)
                 reports.xml.required.set(true)
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 04661ae2..cd60fc0d 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -5,12 +5,16 @@ plugins {
 dependencies {
     api(project(":cache-api"))
 
-    testFixturesImplementation(platform("org.junit:junit-bom:5.14.2"))
+    testFixturesImplementation(platform("org.junit:junit-bom:6.0.2"))
     testFixturesImplementation("org.junit.jupiter:junit-jupiter")
     testFixturesRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
     testFixturesImplementation("org.awaitility:awaitility:4.3.0")
 }
 
+tasks.compileTestFixturesJava {
+    options.release = 17 // jdk 17 is baseline for junit v6
+}
+
 publishing.publications.withType<MavenPublication> {
     pom {
         name.set("Xanthic - Core Module")
diff --git a/kotlin/build.gradle.kts b/kotlin/build.gradle.kts
index 03daebd0..30a8bcef 100644
--- a/kotlin/build.gradle.kts
+++ b/kotlin/build.gradle.kts
@@ -22,6 +22,12 @@ tasks.withType<KotlinJvmCompile>().configureEach {
     }
 }
 
+tasks.compileTestKotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_17 // jdk 17 is baseline for junit v6
+    }
+}
+
 tasks.kotlinSourcesJar {
     // Workaround for https://youtrack.jetbrains.com/issue/KT-54207/ in order to restore reproducibility
     enabled = false