diff --git a/build-logic/android-plugins/src/main/kotlin/dev.msfjarvis.claw.android-common.gradle.kts b/build-logic/android-plugins/src/main/kotlin/dev.msfjarvis.claw.android-common.gradle.kts
index d2723ac8..65ad5578 100644
--- a/build-logic/android-plugins/src/main/kotlin/dev.msfjarvis.claw.android-common.gradle.kts
+++ b/build-logic/android-plugins/src/main/kotlin/dev.msfjarvis.claw.android-common.gradle.kts
@@ -4,7 +4,10 @@
  */
 @file:Suppress("UnstableApiUsage")
 
+import com.android.build.api.variant.ApplicationAndroidComponentsExtension
+import com.android.build.api.variant.LibraryAndroidComponentsExtension
 import com.android.build.gradle.TestedExtension
+import org.gradle.kotlin.dsl.findByType
 
 extensions.configure<TestedExtension> {
   compileSdkVersion = "android-Tiramisu"
@@ -13,6 +16,20 @@ extensions.configure<TestedExtension> {
     targetSdkPreview = "Tiramisu"
   }
 
+  extensions.findByType<LibraryAndroidComponentsExtension>()?.run {
+    beforeVariants(selector().withBuildType("release")) {
+      it.enableUnitTest = false
+      it.enableAndroidTest = false
+    }
+  }
+
+  extensions.findByType<ApplicationAndroidComponentsExtension>()?.run {
+    beforeVariants(selector().withBuildType("release")) {
+      it.enableUnitTest = false
+      it.enableAndroidTest = false
+    }
+  }
+
   sourceSets {
     named("main") { java.srcDirs("src/main/kotlin") }
     named("test") { java.srcDirs("src/test/kotlin") }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ad67dd4f..1ebf437c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -30,7 +30,7 @@ androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version
 aurora-component = { module = "org.pushing-pixels:aurora-component", version.ref = "aurora" }
 aurora-theming = { module = "org.pushing-pixels:aurora-theming", version.ref = "aurora" }
 aurora-window = { module = "org.pushing-pixels:aurora-window", version.ref = "aurora" }
-build-agp = "com.android.tools.build:gradle:7.0.4"
+build-agp = "com.android.tools.build:gradle:7.4.0-alpha02"
 build-kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 build-kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
 build-spotless = "com.diffplug.spotless:spotless-plugin-gradle:6.6.1"