diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemCardContent.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemCardContent.kt
index a8982d3b3..f16d2f3be 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemCardContent.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemCardContent.kt
@@ -54,6 +54,7 @@ fun VaultItemCardContent(
                 readOnly = true,
                 singleLine = false,
                 modifier = Modifier
+                    .semantics { testTag = "ItemRow" }
                     .fillMaxWidth()
                     .padding(horizontal = 16.dp),
             )
@@ -233,7 +234,6 @@ fun VaultItemCardContent(
                 header = "${stringResource(id = R.string.date_updated)}: ",
                 text = commonState.lastUpdated,
                 modifier = Modifier
-                    .semantics { testTag = "ItemRow" }
                     .fillMaxWidth()
                     .padding(horizontal = 16.dp),
             )
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemIdentityContent.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemIdentityContent.kt
index 3d467e5d0..047d71e01 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemIdentityContent.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemIdentityContent.kt
@@ -47,6 +47,7 @@ fun VaultItemIdentityContent(
                 readOnly = true,
                 singleLine = false,
                 modifier = Modifier
+                    .semantics { testTag = "ItemRow" }
                     .fillMaxWidth()
                     .padding(horizontal = 16.dp),
             )
@@ -263,7 +264,6 @@ fun VaultItemIdentityContent(
                 header = "${stringResource(id = R.string.date_updated)}: ",
                 text = commonState.lastUpdated,
                 modifier = Modifier
-                    .semantics { testTag = "ItemRow" }
                     .fillMaxWidth()
                     .padding(horizontal = 16.dp),
             )
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemLoginContent.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemLoginContent.kt
index 0642323b7..201435b3d 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemLoginContent.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemLoginContent.kt
@@ -66,6 +66,7 @@ fun VaultItemLoginContent(
                 readOnly = true,
                 singleLine = false,
                 modifier = Modifier
+                    .semantics { testTag = "ItemRow" }
                     .fillMaxWidth()
                     .padding(horizontal = 16.dp),
             )
@@ -193,6 +194,7 @@ fun VaultItemLoginContent(
             items(attachments) { attachmentItem ->
                 AttachmentItemContent(
                     modifier = Modifier
+                        .semantics { testTag = "CipherAttachment" }
                         .fillMaxWidth()
                         .padding(start = 16.dp),
                     attachmentItem = attachmentItem,
@@ -209,7 +211,6 @@ fun VaultItemLoginContent(
                 header = "${stringResource(id = R.string.date_updated)}: ",
                 text = commonState.lastUpdated,
                 modifier = Modifier
-                    .semantics { testTag = "ItemRow" }
                     .fillMaxWidth()
                     .padding(horizontal = 16.dp),
             )
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemSecureNoteContent.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemSecureNoteContent.kt
index e8ded888b..f79d6ce71 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemSecureNoteContent.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemSecureNoteContent.kt
@@ -51,6 +51,7 @@ fun VaultItemSecureNoteContent(
                 readOnly = true,
                 singleLine = false,
                 modifier = Modifier
+                    .semantics { testTag = "ItemRow" }
                     .fillMaxWidth()
                     .padding(horizontal = 16.dp),
             )
@@ -131,7 +132,6 @@ fun VaultItemSecureNoteContent(
             Spacer(modifier = Modifier.height(24.dp))
             Row(
                 modifier = Modifier
-                    .semantics { testTag = "ItemRow" }
                     .fillMaxWidth()
                     .padding(horizontal = 16.dp)
                     .semantics(mergeDescendants = true) { },