diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle
index afe9512db1..a4fdbd2718 100644
--- a/framework-platform/framework-platform.gradle
+++ b/framework-platform/framework-platform.gradle
@@ -21,7 +21,7 @@ dependencies {
 	api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1"))
 	api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3"))
 	api(platform("org.junit:junit-bom:5.11.3"))
-	api(platform("org.mockito:mockito-bom:5.14.1"))
+	api(platform("org.mockito:mockito-bom:5.14.2"))
 
 	constraints {
 		api("com.fasterxml:aalto-xml:1.3.2")
diff --git a/gradle/toolchains.gradle b/gradle/toolchains.gradle
index 152abb08db..8c5d248136 100644
--- a/gradle/toolchains.gradle
+++ b/gradle/toolchains.gradle
@@ -55,8 +55,9 @@ plugins.withType(JavaPlugin).configureEach {
 				languageVersion = testLanguageVersion
 			}
 			// Enable Java experimental support in Bytebuddy
-			// Remove when JDK 22 is supported by Mockito
-			if (testLanguageVersion == JavaLanguageVersion.of(22)) {
+			// Bytebuddy 1.15.4 supports JDK <= 24
+			// see https://github.com/raphw/byte-buddy/blob/master/release-notes.md
+			if (testLanguageVersion.compareTo(JavaLanguageVersion.of(24)) > 0 ) {
 				jvmArgs("-Dnet.bytebuddy.experimental=true")
 			}
 		}