diff --git a/.buildkite/commands/connected-tests.sh b/.buildkite/commands/connected-tests.sh
index 2fc465dbf..66dd48388 100644
--- a/.buildkite/commands/connected-tests.sh
+++ b/.buildkite/commands/connected-tests.sh
@@ -17,5 +17,5 @@ gcloud firebase test android run \
 	--type instrumentation \
 	--app app/build/outputs/apk/debug/app-debug.apk \
 	--test app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk \
-	--device model=Nexus5X,version=26,locale=en,orientation=portrait \
+	--device model=MediumPhone.arm,version=34,locale=en,orientation=portrait \
 	--verbosity info
diff --git a/app/src/androidTest/kotlin/org/wordpress/aztec/demo/BaseTest.kt b/app/src/androidTest/kotlin/org/wordpress/aztec/demo/BaseTest.kt
index df840aac5..0ee9d62f3 100644
--- a/app/src/androidTest/kotlin/org/wordpress/aztec/demo/BaseTest.kt
+++ b/app/src/androidTest/kotlin/org/wordpress/aztec/demo/BaseTest.kt
@@ -2,6 +2,7 @@
 
 package org.wordpress.aztec.demo
 
+import android.os.Build
 import android.util.Log
 import androidx.test.rule.GrantPermissionRule
 import androidx.test.runner.AndroidJUnit4
@@ -12,8 +13,11 @@ import org.junit.runner.RunWith
 abstract class BaseTest {
     @Rule
     @JvmField
-    val grantPermissionRule: GrantPermissionRule = GrantPermissionRule.grant(android.Manifest.permission.CAMERA,
-            android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
+    val grantPermissionRule: GrantPermissionRule = if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q) {
+        GrantPermissionRule.grant(android.Manifest.permission.CAMERA)
+    } else {
+        GrantPermissionRule.grant(android.Manifest.permission.CAMERA, android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
+    }
 
     companion object {
         fun label(label: String) {