diff --git a/system-tests/gradle-cucumber/gradle-project/build.gradle.kts b/system-tests/gradle-cucumber/gradle-project/build.gradle.kts
index 505996bca..07d5fea70 100644
--- a/system-tests/gradle-cucumber/gradle-project/build.gradle.kts
+++ b/system-tests/gradle-cucumber/gradle-project/build.gradle.kts
@@ -46,6 +46,8 @@ tasks.test {
 
 tasks.register<Test>("tiaTests") {
     useJUnitPlatform()
+    testClassesDirs = sourceSets.test.get().output.classesDirs
+    classpath = sourceSets.test.get().runtimeClasspath
     configure<TeamscaleTaskExtension> {
         partition = "Cucumber Tests"
         collectTestwiseCoverage = true
diff --git a/system-tests/gradle-cucumber/gradle-project/gradle/wrapper/gradle-wrapper.properties b/system-tests/gradle-cucumber/gradle-project/gradle/wrapper/gradle-wrapper.properties
index e18bc253b..1a704683a 100644
--- a/system-tests/gradle-cucumber/gradle-project/gradle/wrapper/gradle-wrapper.properties
+++ b/system-tests/gradle-cucumber/gradle-project/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/system-tests/gradle-multi-module/gradle-project/gradle/wrapper/gradle-wrapper.properties b/system-tests/gradle-multi-module/gradle-project/gradle/wrapper/gradle-wrapper.properties
index e18bc253b..1a704683a 100644
--- a/system-tests/gradle-multi-module/gradle-project/gradle/wrapper/gradle-wrapper.properties
+++ b/system-tests/gradle-multi-module/gradle-project/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME