diff --git a/gradle/build-logic/dev/src/main/kotlin/build-logic.gradle-plugin.gradle.kts b/gradle/build-logic/dev/src/main/kotlin/build-logic.gradle-plugin.gradle.kts
index b52396c5..e922e683 100644
--- a/gradle/build-logic/dev/src/main/kotlin/build-logic.gradle-plugin.gradle.kts
+++ b/gradle/build-logic/dev/src/main/kotlin/build-logic.gradle-plugin.gradle.kts
@@ -11,7 +11,7 @@ gradlePlugin {
 }
 
 val createClasspathManifest = tasks.register("createClasspathManifest") {
-    val outputDir = file("${buildDir}/${name}")
+    val outputDir = file(project.layout.buildDirectory.file(name))
 
     inputs.files(sourceSets.main.get().runtimeClasspath)
     outputs.dir(outputDir)
diff --git a/gradle/build-logic/dev/src/main/kotlin/build-logic.kotlin-conventions.gradle.kts b/gradle/build-logic/dev/src/main/kotlin/build-logic.kotlin-conventions.gradle.kts
index 3009edfa..085ad1fa 100644
--- a/gradle/build-logic/dev/src/main/kotlin/build-logic.kotlin-conventions.gradle.kts
+++ b/gradle/build-logic/dev/src/main/kotlin/build-logic.kotlin-conventions.gradle.kts
@@ -1,4 +1,3 @@
-import gradle.kotlin.dsl.accessors._81cadab438125fe32232621fe97f8fea.testImplementation
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fae08049..d642e7f8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/tutteli-gradle-publish/src/main/kotlin/ch.tutteli.gradle.plugins.publish/PublishPlugin.kt b/tutteli-gradle-publish/src/main/kotlin/ch.tutteli.gradle.plugins.publish/PublishPlugin.kt
index 8766297f..941c4324 100644
--- a/tutteli-gradle-publish/src/main/kotlin/ch.tutteli.gradle.plugins.publish/PublishPlugin.kt
+++ b/tutteli-gradle-publish/src/main/kotlin/ch.tutteli.gradle.plugins.publish/PublishPlugin.kt
@@ -42,8 +42,19 @@ class PublishPlugin : Plugin<Project> {
             // as well as https://github.com/gradle/gradle/issues/10900
             isPreserveFileTimestamps = false
             isReproducibleFileOrder = true
+
+            // TODO 6.0.0 switch to the following once we drop support for gradle 6, require 7.4 at least
+            @Suppress("DEPRECATION")
             dirMode = "775".toInt(8)
+            @Suppress("DEPRECATION")
             fileMode = "664".toInt(8)
+//            dirPermissions {
+//                unix("rwxrwxr-x")
+//            }
+//
+//            filePermissions {
+//                unix("rw-rw-r--")
+//            }
         }
 
         project.tasks.withType<Jar>()
diff --git a/tutteli-gradle-publish/src/test/groovy/ch/tutteli/gradle/plugins/publish/PublishPluginIntTest.groovy b/tutteli-gradle-publish/src/test/groovy/ch/tutteli/gradle/plugins/publish/PublishPluginIntTest.groovy
index b6754477..c9289f4e 100644
--- a/tutteli-gradle-publish/src/test/groovy/ch/tutteli/gradle/plugins/publish/PublishPluginIntTest.groovy
+++ b/tutteli-gradle-publish/src/test/groovy/ch/tutteli/gradle/plugins/publish/PublishPluginIntTest.groovy
@@ -148,7 +148,7 @@ class PublishPluginIntTest {
         }
         def result = builder
             .withProjectDir(settingsSetup.tmp)
-            .withArguments("publishAllPublicationsToMavenRepository",  "--stacktrace")
+            .withArguments("publishAllPublicationsToMavenRepository", "--stacktrace")
             .build()
 
         //assert
@@ -303,6 +303,7 @@ class PublishPluginIntTest {
         //assert
         def dependentReleasePath = getReleasePath(settingsSetup, dependentName, groupId, version, dependentName)
         def (dependentPom, dependentPomName) = getPomInclFileNameAndAssertBasicPomProperties(dependentReleasePath, dependentName, groupId, version, githubUser, rootProjectName)
+
         assertContainsRegex(dependentPom, "licenses", "<licenses>$NL_INDENT" +
             "<license>$NL_INDENT" +
             "<name>${StandardLicenses.EUPL_1_2.longName}</name>$NL_INDENT" +
@@ -319,6 +320,18 @@ class PublishPluginIntTest {
             "<url>https://tutteli.ch</url>$NL_INDENT" +
             "</developer>$NL_INDENT" +
             "</developers>")
+
+        String runtimeDependency = ""
+        if (gradleVersion != null && (gradleVersion.startsWith("6") || gradleVersion.startsWith("7"))) {
+            runtimeDependency = "<dependency>$NL_INDENT" +
+                "<groupId>$groupId</groupId>$NL_INDENT" +
+                "<artifactId>$subprojectName</artifactId>$NL_INDENT" +
+                "<version>$version</version>$NL_INDENT" +
+                "<scope>runtime</scope>$NL_INDENT" +
+                "</dependency>$NL_INDENT" +
+                "</dependencies>"
+        }
+
         assertContainsRegex(dependentPom, "dependencies", "<dependencies>$NL_INDENT" +
             "<dependency>$NL_INDENT" +
             "<groupId>$groupId</groupId>$NL_INDENT" +
@@ -331,14 +344,7 @@ class PublishPluginIntTest {
             "<artifactId>kotlin-stdlib-jdk8</artifactId>$NL_INDENT" +
             "<version>$KOTLIN_VERSION</version>$NL_INDENT" +
             "<scope>compile</scope>$NL_INDENT" +
-            "</dependency>$NL_INDENT" +
-            "<dependency>$NL_INDENT" +
-            "<groupId>$groupId</groupId>$NL_INDENT" +
-            "<artifactId>$subprojectName</artifactId>$NL_INDENT" +
-            "<version>$version</version>$NL_INDENT" +
-            "<scope>runtime</scope>$NL_INDENT" +
-            "</dependency>$NL_INDENT" +
-            "</dependencies>"
+            "</dependency>$NL_INDENT" + runtimeDependency
         )
 
         def repoUrl = "https://github.com/$githubUser/$rootProjectName"
diff --git a/tutteli-gradle-publish/src/test/groovy/ch/tutteli/gradle/plugins/publish/PublishPluginSmokeTest.groovy b/tutteli-gradle-publish/src/test/groovy/ch/tutteli/gradle/plugins/publish/PublishPluginSmokeTest.groovy
index 55e975b8..dbfbe1ef 100644
--- a/tutteli-gradle-publish/src/test/groovy/ch/tutteli/gradle/plugins/publish/PublishPluginSmokeTest.groovy
+++ b/tutteli-gradle-publish/src/test/groovy/ch/tutteli/gradle/plugins/publish/PublishPluginSmokeTest.groovy
@@ -64,18 +64,6 @@ class PublishPluginSmokeTest {
         assertExtensionAndTaskDefinedAfterEvaluate(project)
     }
 
-    @Test
-    void kotlinOldPlatformJs_TasksAndExtensionPresent() {
-        //arrange & act
-        Project project = setUp { project ->
-            project.plugins.apply('kotlin-platform-js')
-        }
-        project.evaluate()
-        //assert
-        assertExtensionAndTaskDefinedAfterEvaluate(project)
-    }
-
-
     @Test
     void kotlinMultiplatform_TasksAndExtensionPresent() {
         //arrange & act
diff --git a/tutteli-gradle-spek/build.gradle.kts b/tutteli-gradle-spek/build.gradle.kts
index ee69025d..2f25a0fd 100644
--- a/tutteli-gradle-spek/build.gradle.kts
+++ b/tutteli-gradle-spek/build.gradle.kts
@@ -59,7 +59,7 @@ afterEvaluate {
 sourceSets {
     main {
         groovy {
-            srcDirs("src/main/generated/")
+            srcDirs("src/main/generated/groovy")
         }
     }
 }
diff --git a/tutteli-gradle-spek/src/test/groovy/ch/tutteli/gradle/plugins/spek/SpekPluginIntTest.groovy b/tutteli-gradle-spek/src/test/groovy/ch/tutteli/gradle/plugins/spek/SpekPluginIntTest.groovy
index e1dfc08b..143f0f85 100644
--- a/tutteli-gradle-spek/src/test/groovy/ch/tutteli/gradle/plugins/spek/SpekPluginIntTest.groovy
+++ b/tutteli-gradle-spek/src/test/groovy/ch/tutteli/gradle/plugins/spek/SpekPluginIntTest.groovy
@@ -56,7 +56,7 @@ class SpekPluginIntTest {
         }
         def result = builder
             .withProjectDir(settingsSetup.tmp)
-            .withArguments("clean", "build")
+            .withArguments("clean", "build", "--stacktrace")
             .build()
         assertTrue(result.output.contains("was here"), "println in output:\n" + result.output)
         def failed = result.taskPaths(TaskOutcome.FAILED)
@@ -64,8 +64,8 @@ class SpekPluginIntTest {
     }
 
     static List<Arguments> kotlinVersionAndGradle() {
-        return ['1.7.20', '1.8.10', '1.9.10'].collectMany { kotlinVersion ->
-            def gradleVersions = ['8.1.1', '8.3']
+        return ['1.8.10', '1.9.10', '2.0.20'].collectMany { kotlinVersion ->
+            def gradleVersions = ['8.3', '8.10']
             gradleVersions.collect { gradleVersion ->
                 Arguments.of(kotlinVersion, gradleVersion)
             }
diff --git a/tutteli-gradle-spek/src/test/groovy/ch/tutteli/gradle/plugins/spek/SpekPluginSmokeTest.groovy b/tutteli-gradle-spek/src/test/groovy/ch/tutteli/gradle/plugins/spek/SpekPluginSmokeTest.groovy
index 331c3526..34b320ce 100644
--- a/tutteli-gradle-spek/src/test/groovy/ch/tutteli/gradle/plugins/spek/SpekPluginSmokeTest.groovy
+++ b/tutteli-gradle-spek/src/test/groovy/ch/tutteli/gradle/plugins/spek/SpekPluginSmokeTest.groovy
@@ -20,10 +20,6 @@ class SpekPluginSmokeTest {
         smokeTest(KotlinPluginWrapper)
     }
 
-    @Test
-    void smokeTest_KotlinPlatformJvmPlugin() {
-        smokeTest(KotlinPlatformJvmPlugin)
-    }
     @Test
     void smokeTest_KotlinMultiPlatformPlugin() {
         smokeTest(KotlinMultiplatformPluginWrapper)