3 files changed, 9 insertions, 2 deletions
diff --git a/android/test/common/build.gradle.kts b/android/test/common/build.gradle.kts
index 311742c412..99fcb9d2a7 100644
--- a/android/test/common/build.gradle.kts
+++ b/android/test/common/build.gradle.kts
@@ -25,7 +25,9 @@ android {
 }
 
 androidComponents {
-    beforeVariants { variantBuilder -> variantBuilder.apply { enable = name != "release" } }
+    beforeVariants { variantBuilder ->
+        variantBuilder.apply { enable = name != BuildTypes.RELEASE }
+    }
 }
 
 dependencies {
diff --git a/android/test/e2e/build.gradle.kts b/android/test/e2e/build.gradle.kts
index 104f17bceb..8e24974fcd 100644
--- a/android/test/e2e/build.gradle.kts
+++ b/android/test/e2e/build.gradle.kts
@@ -16,6 +16,9 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         targetProjectPath = ":app"
 
+        missingDimensionStrategy(FlavorDimensions.BILLING, Flavors.OSS)
+        missingDimensionStrategy(FlavorDimensions.INFRASTRUCTURE, Flavors.PROD)
+
         fun Properties.addRequiredPropertyAsBuildConfigField(name: String) {
             val value = getProperty(name) ?: throw GradleException("Missing property: $name")
             buildConfigField(type = "String", name = name, value = "\"$value\"")
@@ -73,7 +76,6 @@ configure<org.owasp.dependencycheck.gradle.extension.DependencyCheckExtension> {
 dependencies {
     implementation(project(Projects.testCommon))
     implementation(project(Dependencies.Mullvad.endpointLib))
-
     implementation(Dependencies.AndroidX.testCore)
     // Fixes: https://github.com/android/android-test/issues/1589
     implementation(Dependencies.AndroidX.testMonitor)
diff --git a/android/test/mockapi/build.gradle.kts b/android/test/mockapi/build.gradle.kts
index dd08cd66a5..8be38fdcbc 100644
--- a/android/test/mockapi/build.gradle.kts
+++ b/android/test/mockapi/build.gradle.kts
@@ -13,6 +13,9 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         targetProjectPath = ":app"
 
+        missingDimensionStrategy(FlavorDimensions.BILLING, Flavors.OSS)
+        missingDimensionStrategy(FlavorDimensions.INFRASTRUCTURE, Flavors.PROD)
+
         testInstrumentationRunnerArguments.putAll(
             mapOf(
                 "clearPackageData" to "true",