diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/AutoFillScreen.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/AutoFillScreen.kt
index 816e4de0a3..9b04a7204a 100644
--- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/AutoFillScreen.kt
+++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/AutoFillScreen.kt
@@ -346,6 +346,7 @@ private fun AutoFillScreenContent(
             onClick = autoFillHandlers.onBlockAutoFillClick,
             cardStyle = CardStyle.Full,
             modifier = Modifier
+                .testTag("BlockAutoFillButton")
                 .standardHorizontalMargin()
                 .fillMaxWidth(),
         )
diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/blockautofill/AddEditBlockedUriDialog.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/blockautofill/AddEditBlockedUriDialog.kt
index 9301c5a1ee..f9d0714598 100644
--- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/blockautofill/AddEditBlockedUriDialog.kt
+++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/blockautofill/AddEditBlockedUriDialog.kt
@@ -96,6 +96,7 @@ fun AddEditBlockedUriDialog(
                     onValueChange = onUriChange,
                     keyboardType = KeyboardType.Uri,
                     cardStyle = CardStyle.Full,
+                    textFieldTestTag = "BlockedUriEntry",
                     modifier = Modifier
                         .standardHorizontalMargin()
                         .fillMaxWidth(),