diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 31ea2513..530ea734 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -33,9 +33,6 @@ kotlin {
       implementation(libs.coil.compose)
     }
     dependsOn(sourceSets["androidAndroidTestRelease"])
-    dependsOn(sourceSets["androidTestFixtures"])
-    dependsOn(sourceSets["androidTestFixturesDebug"])
-    dependsOn(sourceSets["androidTestFixturesRelease"])
   }
   sourceSets["desktopMain"].apply {
     resources.srcDir("src/androidMain/res/drawable/")
diff --git a/database/build.gradle.kts b/database/build.gradle.kts
index 256d4b20..33f1d7d4 100644
--- a/database/build.gradle.kts
+++ b/database/build.gradle.kts
@@ -13,9 +13,6 @@ kotlin {
   sourceSets["androidMain"].apply {
     dependencies { implementation(libs.sqldelight.androidDriver) }
     dependsOn(sourceSets["androidAndroidTestRelease"])
-    dependsOn(sourceSets["androidTestFixtures"])
-    dependsOn(sourceSets["androidTestFixturesDebug"])
-    dependsOn(sourceSets["androidTestFixturesRelease"])
   }
   sourceSets["commonMain"].apply {
     dependencies { implementation(libs.sqldelight.primitiveAdapters) }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2509e532..947acbb7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -27,7 +27,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.1.3"
+build-agp = "com.android.tools.build:gradle:7.0.4"
 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.4.2"
diff --git a/model/build.gradle.kts b/model/build.gradle.kts
index e4c00ccb..740df474 100644
--- a/model/build.gradle.kts
+++ b/model/build.gradle.kts
@@ -10,12 +10,7 @@ plugins {
 kotlin {
   android()
   jvm()
-  sourceSets["androidMain"].apply {
-    dependsOn(sourceSets["androidAndroidTestRelease"])
-    dependsOn(sourceSets["androidTestFixtures"])
-    dependsOn(sourceSets["androidTestFixturesDebug"])
-    dependsOn(sourceSets["androidTestFixturesRelease"])
-  }
+  sourceSets["androidMain"].apply { dependsOn(sourceSets["androidAndroidTestRelease"]) }
   sourceSets["commonMain"].apply {
     dependencies { implementation(libs.kotlinx.serialization.core) }
   }