diff --git a/.github/workflows/gradle-plugin.yml b/.github/workflows/gradle-plugin.yml
index d5d688cc4aa..53a51f71963 100644
--- a/.github/workflows/gradle-plugin.yml
+++ b/.github/workflows/gradle-plugin.yml
@@ -17,8 +17,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, macos-14, windows-2022]
-        gradle: [7.4, 8.7]
-        agp: [8.1.0, 8.4.0]
+        gradle: [7.4, 8.8]
+        agp: [8.1.0, 8.5.0]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties
index 2a3aaa45758..af381fcbcb0 100644
--- a/gradle-plugins/gradle.properties
+++ b/gradle-plugins/gradle.properties
@@ -15,8 +15,8 @@ compose.tests.kotlin.version=2.0.0
 # Don't forget to edit versions in .github/workflows/gradle-plugin.yml as well
 # and Publish.Subtasks.buildTypes.gradle.GradlePluginTestKt#gradleVersions in the TC config
 # minimal and current gradle version
-compose.tests.gradle.versions=7.4, 8.7
-compose.tests.agp.versions=8.1.0, 8.4.0
+compose.tests.gradle.versions=7.4, 8.8
+compose.tests.agp.versions=8.1.0, 8.5.0
 
 # A version of Gradle plugin, that will be published,
 # unless overridden by COMPOSE_GRADLE_PLUGIN_VERSION env var.