diff --git a/gradle-plugin-cmake/src/test/groovy/org/xbib/gradle/plugin/cmake/test/CmakePluginIntegrationTest.groovy b/gradle-plugin-cmake/src/test/groovy/org/xbib/gradle/plugin/cmake/test/CmakePluginIntegrationTest.groovy
index aab05c8..6ec59d6 100644
--- a/gradle-plugin-cmake/src/test/groovy/org/xbib/gradle/plugin/cmake/test/CmakePluginIntegrationTest.groovy
+++ b/gradle-plugin-cmake/src/test/groovy/org/xbib/gradle/plugin/cmake/test/CmakePluginIntegrationTest.groovy
@@ -5,10 +5,13 @@ import org.gradle.testkit.runner.GradleRunner
 import org.gradle.testkit.runner.TaskOutcome
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.condition.DisabledOnOs
+import org.junit.jupiter.api.condition.OS
 import org.junit.jupiter.api.io.TempDir
 
 import static org.junit.jupiter.api.Assertions.assertEquals
 
+@DisabledOnOs(OS.MAC)
 class CmakePluginIntegrationTest {
 
     private File projectDir
diff --git a/gradle-plugin-docker/src/test/groovy/org/xbib/gradle/plugin/docker/DockerPluginIntegrationTest.groovy b/gradle-plugin-docker/src/test/groovy/org/xbib/gradle/plugin/docker/DockerPluginIntegrationTest.groovy
index cdd0ca1..476764e 100644
--- a/gradle-plugin-docker/src/test/groovy/org/xbib/gradle/plugin/docker/DockerPluginIntegrationTest.groovy
+++ b/gradle-plugin-docker/src/test/groovy/org/xbib/gradle/plugin/docker/DockerPluginIntegrationTest.groovy
@@ -5,10 +5,13 @@ import org.gradle.testkit.runner.GradleRunner
 import org.gradle.testkit.runner.TaskOutcome
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.condition.DisabledOnOs
+import org.junit.jupiter.api.condition.OS
 import org.junit.jupiter.api.io.TempDir
 
 import static org.junit.jupiter.api.Assertions.assertEquals
 
+@DisabledOnOs(OS.MAC)
 class DockerPluginIntegrationTest {
 
     private File projectDir
diff --git a/gradle.properties b/gradle.properties
index a41ba26..986011a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,4 +2,4 @@ group = org.xbib.gradle.plugin
 name = gradle-plugins
 
 # version reflects gradle version plus a patch level version
-version = 8.5.0
+version = 8.7.0
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d64cd49..e644113 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 1af9e09..b82aa23 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.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew.bat b/gradlew.bat
index 6689b85..7101f8e 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/settings.gradle b/settings.gradle
index 1d88641..3ca56fd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,7 +2,7 @@
 dependencyResolutionManagement {
     versionCatalogs {
         libs {
-            version('gradle', '8.5')
+            version('gradle', '8.7')
             version('groovy', '3.0.17') // MUST match gradle groovy version
             // Java 21
             version('asm', '9.6')
@@ -25,7 +25,7 @@ dependencyResolutionManagement {
             plugin('publish', 'com.gradle.plugin-publish').version('1.2.1')
         }
         testLibs {
-            version('junit', '5.10.1')
+            version('junit', '5.10.2')
             version('spock', '2.3-groovy-3.0')
             library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit')
             library('junit-jupiter-params', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junit')