diff --git a/build.gradle b/build.gradle
index 4bb9c0980a98f..b794319a7209f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1244,6 +1244,8 @@ project(':core') {
       // To prevent a UniqueResourceException due the same resource existing in both
       // org.apache.directory.api/api-all and org.apache.directory.api/api-ldap-schema-data
       testRuntimeOnly.exclude module: 'api-ldap-schema-data'
+      testCompileClasspath.exclude group: 'org.bouncycastle', module: 'bcprov-jdk15on'
+      testRuntimeClasspath.exclude group: 'org.bouncycastle', module: 'bcprov-jdk15on'
     }
 
     testRuntimeOnly(libs.apacheda) {
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index e43642c305589..65f2e985a7d59 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -59,7 +59,7 @@ versions += [
   commonsValidator: "1.10.1",
   commonsNet: "3.13.0",
   classgraph: "4.8.179",
-  gradle: "9.4.1",
+  gradle: "9.6.1",
   grgit: "5.3.3",
   httpclient: "4.5.14",
   jackson: "2.21.5",
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8e61ef12590c9..da32a7e2ea3ed 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
+distributionSha256Sum=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 682f87e3db188..71975a2c76ad3 100755
--- a/gradlew
+++ b/gradlew
@@ -201,10 +201,10 @@ fi
 
 
 # Loop in case we encounter an error.
-REQUIRED_WRAPPER_JAR_CHECKSUM="55243ef57851f12b070ad14f7f5bb8302daceeebc5bce5ece5fa6edb23e1145c"
+REQUIRED_WRAPPER_JAR_CHECKSUM="497c8c2a7e5031f6aa847f88104aa80a93532ec32ee17bdb8d1d2f67a194a9c7"
 for attempt in 1 2 3; do
   if [ ! -e "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" ]; then
-    if ! curl -s -S --retry 3 -L -o "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" "https://raw.githubusercontent.com/gradle/gradle/v9.4.1/gradle/wrapper/gradle-wrapper.jar"; then
+    if ! curl -s -S --retry 3 -L -o "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" "https://raw.githubusercontent.com/gradle/gradle/v9.6.1/gradle/wrapper/gradle-wrapper.jar"; then
       rm -f "$APP_HOME/gradle/wrapper/gradle-wrapper.jar"
       # Pause for a bit before looping in case the server throttled us.
       sleep 5
diff --git a/wrapper.gradle b/wrapper.gradle
index e30b10d10dd90..7d06703ca0b03 100644
--- a/wrapper.gradle
+++ b/wrapper.gradle
@@ -40,7 +40,7 @@ task bootstrapWrapper() {
         // of curl (built against OpenSSL library that doesn't support TLSv1.2) would fail to
         // fetch the jar.
         // IMPORTANT: This checksum **must** be updated whenever the Gradle version changes.
-        String wrapperChecksum = "55243ef57851f12b070ad14f7f5bb8302daceeebc5bce5ece5fa6edb23e1145c"
+        String wrapperChecksum = "497c8c2a7e5031f6aa847f88104aa80a93532ec32ee17bdb8d1d2f67a194a9c7"
         def wrapperJarUrl = "https://raw.githubusercontent.com/gradle/gradle/v$versions.gradle/gradle/wrapper/gradle-wrapper.jar"
 
         def bootstrapString = """