diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e5de52b4d9..07443f1d74 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,7 +41,7 @@ jobs:
       matrix:
         kind: [maven, gradle]
         # Test on the latest Java version once Gradle & Maven support it.
-        jre: [11, 17, 21, 23]
+        jre: [11, 17, 21, 24]
         os: [ubuntu-latest]
         include:
           # test windows at the diagonals of the above matrix
diff --git a/gradle/java-setup.gradle b/gradle/java-setup.gradle
index 6663447ba4..97e442cf98 100644
--- a/gradle/java-setup.gradle
+++ b/gradle/java-setup.gradle
@@ -23,6 +23,8 @@ spotbugs {
 		// https://spotbugs.readthedocs.io/en/latest/detectors.html#findreturnref
 		'FindReturnRef',
 	]
+	// TODO: https://github.com/spotbugs/spotbugs-gradle-plugin/issues/1360
+	toolVersion = '4.9.3'
 }
 tasks.named('spotbugsTest') {
 	enabled = false
diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 880830740b..30e1f0b998 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -102,4 +102,6 @@ p2deps {
 spotbugs {
 	// LOW|MEDIUM|DEFAULT|HIGH (low = sensitive to even minor mistakes).
 	reportLevel = com.github.spotbugs.snom.Confidence.valueOf('LOW')
+	// TODO: https://github.com/spotbugs/spotbugs-gradle-plugin/issues/1360
+	toolVersion = '4.9.3'
 }
diff --git a/lib/build.gradle b/lib/build.gradle
index fcf59cd414..3cdbcc6f29 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -138,6 +138,8 @@ dependencies {
 spotbugs {
 	// LOW|MEDIUM|DEFAULT|HIGH (low = sensitive to even minor mistakes).
 	reportLevel = com.github.spotbugs.snom.Confidence.valueOf('LOW')
+	// TODO: https://github.com/spotbugs/spotbugs-gradle-plugin/issues/1360
+	toolVersion = '4.9.3'
 }
 
 apply from: rootProject.file('gradle/special-tests.gradle')
diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
index 100bdefc50..21fef4bc27 100644
--- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
+++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GradleIntegrationHarness.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,8 +54,11 @@ public enum GradleVersionSupport {
 		GradleVersionSupport(String version) {
 			String minVersionForRunningJRE;
 			switch (Jvm.version()) {
-			case 24:
+			case 25:
 				// TODO: https://docs.gradle.org/current/userguide/compatibility.html
+			case 24:
+				minVersionForRunningJRE = "8.14";
+				break;
 			case 23:
 				minVersionForRunningJRE = "8.10";
 				break;
diff --git a/testlib/build.gradle b/testlib/build.gradle
index 2d10006a60..f92f58a2c4 100644
--- a/testlib/build.gradle
+++ b/testlib/build.gradle
@@ -27,6 +27,8 @@ dependencies {
 spotbugs {
 	// LOW|MEDIUM|DEFAULT|HIGH (low = sensitive to even minor mistakes).
 	reportLevel = com.github.spotbugs.snom.Confidence.valueOf('HIGH')
+	// TODO: https://github.com/spotbugs/spotbugs-gradle-plugin/issues/1360
+	toolVersion = '4.9.3'
 }
 
 apply from: rootProject.file('gradle/special-tests.gradle')