diff --git a/.github/workflows/gradle-plugin.yml b/.github/workflows/gradle-plugin.yml
index 948dc56bd9..79c728c59d 100644
--- a/.github/workflows/gradle-plugin.yml
+++ b/.github/workflows/gradle-plugin.yml
@@ -16,9 +16,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ['ubuntu-24.04', 'macos-15-xlarge', 'windows-2022']
+        os: ['windows-2022']
         gradle: ['8.13', '9.3.0']
-        agp: ['8.12.3', '9.0.0']
+        agp: ['8.13.2', '9.0.0']
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout Repository
@@ -50,7 +50,7 @@ jobs:
         working-directory: gradle-plugins
         run: |
           ./gradlew assemble
-          ./gradlew --continue :preview-rpc:test :compose:test ':compose:test-Gradle(${{ matrix.gradle }})-Agp(${{ matrix.agp }})'
+          ./gradlew --continue :preview-rpc:test :compose:test ':compose:test-Gradle(${{ matrix.gradle }})-Agp(${{ matrix.agp }})' --tests "org.jetbrains.compose.test.tests.integration.WebCompatibilityDistributionTest"
 
       - name: Upload Reports
         uses: actions/upload-artifact@v4
diff --git a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt
index c79e415bd5..592a99e00f 100644
--- a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt
+++ b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt
@@ -450,25 +450,21 @@ class ResourcesTest : GradlePluginTestBase() {
             }
         }
 
-        // TODO: remove skip after https://youtrack.jetbrains.com/issue/CMP-9845/
-        val skipWebCheck = currentOS == OS.Windows && defaultTestEnvironment.agpVersion.contains("8.12.3")
-        if (!skipWebCheck) {
-            gradle(":webApp:build").checks {
-                check.taskSuccessful(":sharedUI:wasmJsCopyHierarchicalMultiplatformResources")
-                check.taskSuccessful(":sharedUI:jsCopyHierarchicalMultiplatformResources")
-
-                val jsBuildDir = file("webApp/build/dist/js/productionExecutable")
-                commonResourcesFiles.forEach { res ->
-                    assertTrue(jsBuildDir.resolve(res).exists())
-                }
-                assertEquals("js", jsBuildDir.resolve("$repackDir/files/platform.txt").readText())
+        gradle(":webApp:build").checks {
+            check.taskSuccessful(":sharedUI:wasmJsCopyHierarchicalMultiplatformResources")
+            check.taskSuccessful(":sharedUI:jsCopyHierarchicalMultiplatformResources")
 
-                val wasmJsBuildDir = file("webApp/build/dist/wasmJs/productionExecutable")
-                commonResourcesFiles.forEach { res ->
-                    assertTrue(wasmJsBuildDir.resolve(res).exists())
-                }
-                assertEquals("wasm", wasmJsBuildDir.resolve("$repackDir/files/platform.txt").readText())
+            val jsBuildDir = file("webApp/build/dist/js/productionExecutable")
+            commonResourcesFiles.forEach { res ->
+                assertTrue(jsBuildDir.resolve(res).exists())
+            }
+            assertEquals("js", jsBuildDir.resolve("$repackDir/files/platform.txt").readText())
+
+            val wasmJsBuildDir = file("webApp/build/dist/wasmJs/productionExecutable")
+            commonResourcesFiles.forEach { res ->
+                assertTrue(wasmJsBuildDir.resolve(res).exists())
             }
+            assertEquals("wasm", wasmJsBuildDir.resolve("$repackDir/files/platform.txt").readText())
         }
 
 
diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties
index df181725a3..ef6d296670 100644
--- a/gradle-plugins/gradle.properties
+++ b/gradle-plugins/gradle.properties
@@ -17,7 +17,7 @@ compose.tests.kotlin.version=2.3.10
 # and Publish.Subtasks.buildTypes.gradle.GradlePluginTestKt#gradleVersions in the TC config
 # minimal and current gradle version
 compose.tests.gradle.versions=8.13, 9.3.0
-compose.tests.agp.versions=8.12.3, 9.0.0
+compose.tests.agp.versions=8.13.2, 9.0.0
 # gradle and agp versions should be compatible:
 # https://developer.android.com/build/releases/gradle-plugin#updating-plugin
 compose.tests.gradle-agp.exclude=8.13/9.0.0