diff --git a/build.gradle.kts b/build.gradle.kts
index dd9baa33d..afbb166d8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,11 +1,4 @@
-buildscript {
-  dependencies { classpath("org.apache.commons:commons-compress:1.28.0") }
-  if (BuildPluginsVersion.AGP.substringBefore(".").toInt() < 8) {
-    // AGP 7.x has troubles with compileSdk 34 due to some R8 shenanigans, so we have to use a newer
-    // version of R* here
-    dependencies { classpath("com.android.tools:r8:8.11.18") }
-  }
-}
+buildscript { dependencies { classpath("org.apache.commons:commons-compress:1.28.0") } }
 
 plugins {
   alias(libs.plugins.kotlin) version BuildPluginsVersion.KOTLIN apply false
diff --git a/plugin-build/src/test/kotlin/io/sentry/android/gradle/integration/BaseSentryPluginTest.kt b/plugin-build/src/test/kotlin/io/sentry/android/gradle/integration/BaseSentryPluginTest.kt
index 5aae46f01..9557fcadb 100644
--- a/plugin-build/src/test/kotlin/io/sentry/android/gradle/integration/BaseSentryPluginTest.kt
+++ b/plugin-build/src/test/kotlin/io/sentry/android/gradle/integration/BaseSentryPluginTest.kt
@@ -74,11 +74,6 @@ abstract class BaseSentryPluginTest(
                 // withPluginClasspath on the Gradle Runner.
                 $additionalBuildClasspath
                 classpath files($pluginClasspath)
-                if ("$androidGradlePluginVersion".split('\\.')[0].toInteger() < 8) {
-                  // AGP 7.x has troubles with compileSdk 34 due to some R8 shenanigans, so we have to use a newer
-                  // version of R* here
-                  classpath 'com.android.tools:r8:8.11.18'
-                }
               }
             }