diff --git a/build.gradle b/build.gradle
index 9abe14ac2..f7238a67a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,6 +48,7 @@ dependencies {
     // Use JUnit Jupiter API for testing.
     testImplementation platform(testLibs.junit.bom)
     testImplementation testLibs.bundles.junit
+    testRuntimeOnly testLibs.junit.platform.launcher
 
     testImplementation testLibs.bundles.hamcrest
     testImplementation testLibs.assertj.core
diff --git a/chacha64-plugin/build.gradle b/chacha64-plugin/build.gradle
index 6d758758f..9e5c569b6 100644
--- a/chacha64-plugin/build.gradle
+++ b/chacha64-plugin/build.gradle
@@ -16,6 +16,7 @@ dependencies {
     // Use JUnit Jupiter API for testing.
     testImplementation platform(testLibs.junit.bom)
     testImplementation testLibs.bundles.junit
+    testRuntimeOnly testLibs.junit.platform.launcher
 }
 
 java {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7f93135c4..d64cd4917 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3fa8f862f..a80b22ce5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew.bat b/gradlew.bat
index 93e3f59f1..25da30dbd 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/jaybird-native/build.gradle b/jaybird-native/build.gradle
index c6b3a2391..6edc82cb3 100644
--- a/jaybird-native/build.gradle
+++ b/jaybird-native/build.gradle
@@ -18,6 +18,7 @@ dependencies {
     // Use JUnit Jupiter API for testing.
     testImplementation platform(testLibs.junit.bom)
     testImplementation testLibs.bundles.junit
+    testRuntimeOnly testLibs.junit.platform.launcher
 }
 
 java {
diff --git a/settings.gradle b/settings.gradle
index 4be0d6690..201805f4d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -21,6 +21,7 @@ dependencyResolutionManagement {
 
             library('junit-bom', 'org.junit', 'junit-bom').versionRef('junit')
             library('junit-jupiter', 'org.junit.jupiter', 'junit-jupiter').withoutVersion()
+            library('junit-platform-launcher', 'org.junit.platform', 'junit-platform-launcher').withoutVersion()
             library('hamcrest', 'org.hamcrest', 'hamcrest').version('2.2')
             library('assertj-core', 'org.assertj', 'assertj-core').version('3.24.2')
             library('mockito-bom', 'org.mockito', 'mockito-bom').versionRef('mockito')