diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 60ae804c..7fd09286 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -9,6 +9,7 @@ plugins {
     alias(libs.plugins.com.google.devtools.ksp)
 }
 
+// Set firebaseEnabled = false for foss build
 var firebaseEnabled = true
 
 android {
@@ -103,6 +104,7 @@ dependencies {
     androidTestImplementation(libs.test.core.ktx)
     androidTestImplementation(libs.androidx.test.ext.junit)
     androidTestImplementation(libs.espresso.core)
+    androidTestImplementation(libs.androidx.uiautomator)
 
     // Jetpack Compose
     // https://developer.android.com/jetpack/compose/bom
@@ -146,8 +148,8 @@ dependencies {
 }
 
 if (firebaseEnabled){
-    apply(plugin = "com.google.firebase.crashlytics")
     apply(plugin = "com.google.gms.google-services")
+    apply(plugin = "com.google.firebase.crashlytics")
 }
 
 apply(plugin = "com.google.dagger.hilt.android")
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1f57d94d..84a2ffea 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -20,6 +20,7 @@ org-jetbrains-kotlin-android = "1.9.10"
 paparazzi = "1.3.1"
 room = "2.5.2"
 ui-test-junit4 = "1.5.0"
+uiautomator = "2.2.0"
 work-runtime-ktx = "2.8.1"
 
 [libraries]
@@ -34,6 +35,7 @@ androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref =
 androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" }
 androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" }
 androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext-junit" }
+androidx-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "uiautomator" }
 androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "work-runtime-ktx" }
 compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose-bom" }
 core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx" }