diff --git a/.github/workflows/gradle-plugin.yml b/.github/workflows/gradle-plugin.yml
index 0a0e81b92a..d5d688cc4a 100644
--- a/.github/workflows/gradle-plugin.yml
+++ b/.github/workflows/gradle-plugin.yml
@@ -18,7 +18,7 @@ jobs:
       matrix:
         os: [ubuntu-20.04, macos-14, windows-2022]
         gradle: [7.4, 8.7]
-        agp: [7.3.1, 8.3.1]
+        agp: [8.1.0, 8.4.0]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
@@ -47,4 +47,4 @@ jobs:
             FILE_NAME=`basename $SUMMARY_FILE`
             echo "## $FILE_NAME" >> $GITHUB_STEP_SUMMARY
             cat $SUMMARY_FILE >> $GITHUB_STEP_SUMMARY
-          done
\ No newline at end of file
+          done
diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties
index ecce3d9625..43681791fc 100644
--- a/gradle-plugins/gradle.properties
+++ b/gradle-plugins/gradle.properties
@@ -20,7 +20,7 @@ compose.tests.js.compiler.compatible.kotlin.version=1.9.24
 # 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=7.3.1, 8.3.1
+compose.tests.agp.versions=8.1.0, 8.4.0
 
 # A version of Gradle plugin, that will be published,
 # unless overridden by COMPOSE_GRADLE_PLUGIN_VERSION env var.