diff --git a/.github/workflows/test-matrix-agp-gradle.yaml b/.github/workflows/test-matrix-agp-gradle.yaml
index 400d76c2..bd2b29db 100644
--- a/.github/workflows/test-matrix-agp-gradle.yaml
+++ b/.github/workflows/test-matrix-agp-gradle.yaml
@@ -19,35 +19,45 @@ jobs:
         agp: [ "7.0.4" ]
         gradle: [ "7.2" ]
         java: [ "11" ]
+        groovy: [ "1.2" ]
         include:
           - agp: "7.2.1"
             gradle: "7.4"
             java: "11"
+            groovy: "1.2"
           - agp: "7.3.0"
             gradle: "7.5"
             java: "11"
+            groovy: "1.2"
           - agp: "7.4.0"
             gradle: "7.6"
             java: "11"
+            groovy: "1.2"
           - agp: "8.0.0"
             gradle: "8.0.2"
             java: "17"
-          - agp: "8.1.2"
-            gradle: "8.1"
+            groovy: "1.2"
+          - agp: "8.6.1"
+            gradle: "8.7"
             java: "17"
-          - agp: "8.2.2"
-            gradle: "8.2"
+            groovy: "1.2"
+          - agp: "8.8.1"
+            gradle: "8.11.1"
             java: "17"
-          - agp: "8.3.0"
-            gradle: "8.4"
+            groovy: "1.7.1"
+          - agp: "8.9.0-rc02"
+            gradle: "8.11.1"
             java: "17"
-          - agp: "8.4.0-alpha11"
-            gradle: "8.6"
+            groovy: "1.7.1"
+          - agp: "8.10.0-alpha05"
+            gradle: "8.11.1"
             java: "17"
+            groovy: "1.7.1"
 
     name: Test Matrix - AGP ${{ matrix.agp }} - Gradle ${{ matrix.gradle }}
     env:
       VERSION_AGP: ${{ matrix.agp }}
+      VERSION_GROOVY: ${{ matrix.groovy }}
       SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
 
     steps:
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 5800f77f..21e0405b 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -12,7 +12,7 @@ object BuildPluginsVersion {
     // build/publications/maven
     const val MAVEN_PUBLISH = "0.17.0"
     const val PROGUARD = "7.1.0"
-    const val GROOVY_REDISTRIBUTED = "1.2"
+    val GROOVY_REDISTRIBUTED = System.getenv("VERSION_GROOVY") ?: "1.2"
     const val BUILDCONFIG = "3.1.0"
 
     const val SPRING_BOOT = "2.7.4"
diff --git a/plugin-build/build.gradle.kts b/plugin-build/build.gradle.kts
index e3cffc3e..1454d0f3 100644
--- a/plugin-build/build.gradle.kts
+++ b/plugin-build/build.gradle.kts
@@ -4,9 +4,7 @@ import io.sentry.android.gradle.internal.ASMifyTask
 import io.sentry.android.gradle.internal.BootstrapAndroidSdk
 import java.io.FileInputStream
 import java.util.Properties
-import org.gradle.api.internal.classpath.ModuleRegistry
 import org.gradle.api.tasks.testing.logging.TestLogEvent
-import org.gradle.configurationcache.extensions.serviceOf
 import org.jetbrains.kotlin.config.KotlinCompilerVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
@@ -101,13 +99,6 @@ dependencies {
     // Needed to read contents from APK/Source Bundles
     testImplementation(Libs.ARSC_LIB)
     testImplementation(Libs.ZIP4J)
-
-    testRuntimeOnly(
-        files(
-            serviceOf<ModuleRegistry>().getModule("gradle-tooling-api-builders")
-                .classpath.asFiles.first()
-        )
-    )
 }
 
 configure<JavaPluginExtension> {
@@ -165,6 +156,11 @@ tasks.named("test").configure {
 tasks.register<Test>("integrationTest").configure {
     group = "verification"
     description = "Runs the integration tests"
+    // for some reason Gradle > 8.10 doesn't pick up the pluginUnderTestMetadata classpath, so we
+    // need to add it manually
+    classpath += layout.files(
+        project.layout.buildDirectory.get().toString() + "/pluginUnderTestMetadata"
+    )
 
     maxParallelForks = Runtime.getRuntime().availableProcessors() / 2
 
@@ -184,6 +180,7 @@ tasks.register<Test>("integrationTest").configure {
     filter {
         includeTestsMatching("io.sentry.android.gradle.integration.*")
     }
+    dependsOn(tasks.withType<PluginUnderTestMetadata>())
 }
 
 gradlePlugin {