3 files changed, 55 insertions, 4 deletions
diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts
index 5df9c08f1e..e47f3c08f9 100644
--- a/android/settings.gradle.kts
+++ b/android/settings.gradle.kts
@@ -1,5 +1,8 @@
-include(":app", ":service", ":tile")
-
+include(
+    ":app",
+    ":service",
+    ":tile"
+)
 include(
     ":lib:common",
     ":lib:endpoint",
@@ -10,5 +13,10 @@ include(
     ":lib:theme",
     ":lib:common-test"
 )
-
-include(":test", ":test:common", ":test:e2e", ":test:mockapi")
+include(
+    ":test",
+    ":test:arch",
+    ":test:common",
+    ":test:e2e",
+    ":test:mockapi"
+)
diff --git a/android/test/arch/build.gradle.kts b/android/test/arch/build.gradle.kts
new file mode 100644
index 0000000000..0a28fd2fab
--- /dev/null
+++ b/android/test/arch/build.gradle.kts
@@ -0,0 +1,42 @@
+plugins {
+    id(Dependencies.Plugin.androidLibraryId)
+    id(Dependencies.Plugin.kotlinAndroidId)
+}
+
+android {
+    namespace = "net.mullvad.mullvadvpn.test.arch"
+    compileSdk = Versions.Android.compileSdkVersion
+
+    defaultConfig {
+        minSdk = Versions.Android.minSdkVersion
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = Versions.jvmTarget
+    }
+
+    lint {
+        lintConfig = file("${rootProject.projectDir}/config/lint.xml")
+        abortOnError = true
+        warningsAsErrors = true
+    }
+}
+
+androidComponents {
+    beforeVariants { variantBuilder ->
+        variantBuilder.apply {
+            enable = name != "release"
+        }
+    }
+}
+
+dependencies {
+    testImplementation(Dependencies.AndroidX.appcompat)
+    testImplementation(Dependencies.junit)
+    testImplementation(Dependencies.konsist)
+}
diff --git a/android/test/arch/src/test/AndroidManifest.xml b/android/test/arch/src/test/AndroidManifest.xml
new file mode 100644
index 0000000000..cc947c5679
--- /dev/null
+++ b/android/test/arch/src/test/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest />