diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 863b0b94..b4cdac92 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -33,6 +33,9 @@ kotlin {
       implementation(libs.coil.compose)
     }
     dependsOn(sourceSets["androidAndroidTestRelease"])
+    dependsOn(sourceSets["androidTestFixtures"])
+    dependsOn(sourceSets["androidTestFixturesDebug"])
+    dependsOn(sourceSets["androidTestFixturesRelease"])
   }
   sourceSets["desktopMain"].apply { dependencies { implementation(libs.kamel.image) } }
 }
diff --git a/database/build.gradle.kts b/database/build.gradle.kts
index 6173b9be..6bff7f73 100644
--- a/database/build.gradle.kts
+++ b/database/build.gradle.kts
@@ -13,6 +13,9 @@ kotlin {
   sourceSets["androidMain"].apply {
     dependencies { implementation(libs.sqldelight.androidDriver) }
     dependsOn(sourceSets["androidAndroidTestRelease"])
+    dependsOn(sourceSets["androidTestFixtures"])
+    dependsOn(sourceSets["androidTestFixturesDebug"])
+    dependsOn(sourceSets["androidTestFixturesRelease"])
   }
   sourceSets["desktopMain"].apply { dependencies { implementation(libs.sqldelight.jvmDriver) } }
   sourceSets["desktopTest"].apply {
diff --git a/gradle.properties b/gradle.properties
index 00a680ce..ec472998 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -54,7 +54,7 @@ android.defaults.buildfeatures.resvalues=false
 android.defaults.buildfeatures.shaders=false
 
 # Disable warnings about unsupported features, we know what we're doing
-android.suppressUnsupportedOptionWarnings=android.enableR8.fullMode,android.enableResourceOptimizations,android.nonTransitiveRClass,android.suppressUnsupportedOptionWarnings
+android.suppressUnsupportedOptionWarnings=android.enableR8.fullMode,android.enableResourceOptimizations,android.nonTransitiveRClass,android.suppressUnsupportedOptionWarnings,android.sdk.channel
 
 # Maven publishing
 GROUP=com.github.android-password-store
diff --git a/model/build.gradle.kts b/model/build.gradle.kts
index 200a7eac..e4c00ccb 100644
--- a/model/build.gradle.kts
+++ b/model/build.gradle.kts
@@ -10,6 +10,12 @@ plugins {
 kotlin {
   android()
   jvm()
+  sourceSets["androidMain"].apply {
+    dependsOn(sourceSets["androidAndroidTestRelease"])
+    dependsOn(sourceSets["androidTestFixtures"])
+    dependsOn(sourceSets["androidTestFixturesDebug"])
+    dependsOn(sourceSets["androidTestFixturesRelease"])
+  }
   sourceSets["commonMain"].apply {
     dependencies { implementation(libs.kotlinx.serialization.core) }
   }