diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 95a38c677..e9825d183 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 micronaut = "4.10.6"
 micronaut-docs = "3.0.0"
-micronaut-test = "4.9.0"
+micronaut-test = "4.10.1"
 
 groovy = "4.0.27"
 spock = "2.3-groovy-4.0"
diff --git a/http-poja-apache/build.gradle b/http-poja-apache/build.gradle
index 76da8d53c..c1e28d137 100644
--- a/http-poja-apache/build.gradle
+++ b/http-poja-apache/build.gradle
@@ -32,3 +32,8 @@ dependencies {
 javadoc {
     failOnError(false)
 }
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
diff --git a/settings.gradle b/settings.gradle
index 4b507f8d3..3ad9f0498 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'io.micronaut.build.shared.settings' version '8.0.0-M4'
+    id 'io.micronaut.build.shared.settings' version '8.0.0-M5'
 }
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
diff --git a/test-sample-poja/build.gradle b/test-sample-poja/build.gradle
index 3393618d9..81565a9e0 100644
--- a/test-sample-poja/build.gradle
+++ b/test-sample-poja/build.gradle
@@ -31,7 +31,9 @@ dependencies {
 
     testAnnotationProcessor(mn.micronaut.inject.java.test)
     testImplementation(mn.micronaut.inject.java)
+    testRuntimeOnly(mnTest.junit.platform.launcher)
     testRuntimeOnly(mnTest.junit.platform.suite)
+    testRuntimeOnly(mnTest.junit.jupiter.engine)
 }
 
 application {
@@ -51,6 +53,6 @@ graalvmNative {
     }
 }
 
-test {
+tasks.withType(Test).configureEach {
     useJUnitPlatform()
 }
diff --git a/test-suite-kotlin-jetty/build.gradle b/test-suite-kotlin-jetty/build.gradle
index 021783d30..8a9055fcf 100644
--- a/test-suite-kotlin-jetty/build.gradle
+++ b/test-suite-kotlin-jetty/build.gradle
@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 plugins {
     id 'io.micronaut.build.internal.servlet.base'
     id "org.jetbrains.kotlin.jvm"
@@ -34,8 +35,13 @@ tasks.named('test') {
     useJUnitPlatform()
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
+
 kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_21
     }
 }