diff --git a/build-logic/src/main/kotlin/Environment.kt b/build-logic/src/main/kotlin/Environment.kt
index c347240e..88cd7b6c 100644
--- a/build-logic/src/main/kotlin/Environment.kt
+++ b/build-logic/src/main/kotlin/Environment.kt
@@ -15,8 +15,8 @@ enum class SupportedAgp(
     AGP_8_4("8.4.2", gradle = "8.6"),
     AGP_8_5("8.5.2", gradle = "8.7"),
     AGP_8_6("8.6.1", gradle = "8.7"),
-    AGP_8_7("8.7.0", gradle = "8.9"),
-    AGP_8_8("8.8.0-alpha05", gradle = "8.10.2"),
+    AGP_8_7("8.7.1", gradle = "8.9"),
+    AGP_8_8("8.8.0-alpha08", gradle = "8.10.2"),
     ;
 
     companion object {
diff --git a/plugin/android-junit5/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/util/projects/FunctionalTestProjectCreator.kt b/plugin/android-junit5/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/util/projects/FunctionalTestProjectCreator.kt
index 59a1e33e..c0201f2d 100644
--- a/plugin/android-junit5/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/util/projects/FunctionalTestProjectCreator.kt
+++ b/plugin/android-junit5/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/util/projects/FunctionalTestProjectCreator.kt
@@ -61,6 +61,9 @@ class FunctionalTestProjectCreator(
     projectFolder.mkdirs()
 
     // Set up static files
+    File(projectFolder, "local.properties").bufferedWriter().use { file ->
+      file.write("sdk.dir = ${environment.androidSdkFolder.absolutePath}")
+    }
     File(projectFolder, "gradle.properties").bufferedWriter().use { file ->
       file.write("android.useAndroidX = true")
     }