diff --git a/TweetNest Tests/Shared/TweetNestScreenTests.swift b/TweetNest Tests/Shared/TweetNestScreenTests.swift
index dc5ca8ea..c1115d8f 100644
--- a/TweetNest Tests/Shared/TweetNestScreenTests.swift	
+++ b/TweetNest Tests/Shared/TweetNestScreenTests.swift	
@@ -69,7 +69,7 @@ class TweetNestScreenTests: XCTestCase {
         // Insert steps here to perform after app launch but before taking a screenshot,
         // such as logging into a test account or navigating somewhere in the app
 
-        app.buttons["Account for \(Self.dispalyUserName)"].tap()
+        app.buttons["\(Self.dispalyUserName):Account"].tap()
 
         XCTAssertTrue(app.navigationBars[Self.dispalyUserName].staticTexts[Self.dispalyUserName].waitForExistence(timeout: 5))
 
@@ -87,7 +87,7 @@ class TweetNestScreenTests: XCTestCase {
         // Insert steps here to perform after app launch but before taking a screenshot,
         // such as logging into a test account or navigating somewhere in the app
 
-        app.buttons["Followings History for \(Self.dispalyUserName)"].tap()
+        app.buttons["\(Self.dispalyUserName):FollowingsHistory"].tap()
 
         XCTAssertTrue(app.staticTexts["@Apple"].waitForExistence(timeout: 5))
 
@@ -106,7 +106,7 @@ class TweetNestScreenTests: XCTestCase {
         // Insert steps here to perform after app launch but before taking a screenshot,
         // such as logging into a test account or navigating somewhere in the app
 
-        app.buttons["Account for \(Self.dispalyUserName)"].tap()
+        app.buttons["\(Self.dispalyUserName):Account"].tap()
 
         XCTAssertTrue(app.navigationBars[Self.dispalyUserName].staticTexts[Self.dispalyUserName].waitForExistence(timeout: 5))
 
diff --git a/TweetNest/Shared/AppSidebarAccountsSection.swift b/TweetNest/Shared/AppSidebarAccountsSection.swift
index e857e5ad..04052b09 100644
--- a/TweetNest/Shared/AppSidebarAccountsSection.swift
+++ b/TweetNest/Shared/AppSidebarAccountsSection.swift
@@ -82,21 +82,21 @@ struct AppSidebarAccountsSection: View {
                 accountNavigationLink
                     .accessibilityElement(children: .ignore)
                     .accessibilityLabel(accountTitle)
-                    .accessibilityIdentifier(accountTitle)
+                    .accessibilityIdentifier("\(displayAccountName):Account")
                     .accessibilityAddTraits(.isButton)
 
                 let followingsTitle = String(localized: "Followings History for \(displayAccountName)", comment: "Navigation link for followings history, grouped by username.")
                 followingsNavigationLink
                     .accessibilityElement(children: .ignore)
                     .accessibilityLabel(followingsTitle)
-                    .accessibilityIdentifier(followingsTitle)
+                    .accessibilityIdentifier("\(displayAccountName):FollowingsHistory")
                     .accessibilityAddTraits(.isButton)
 
                 let followersTitle = String(localized: "Followers History for \(displayAccountName)", comment: "Navigation link for followers history, grouped by username.")
                 followersNavigationLink
                     .accessibilityElement(children: .ignore)
                     .accessibilityLabel(followersTitle)
-                    .accessibilityIdentifier(followersTitle)
+                    .accessibilityIdentifier("\(displayAccountName):FollowersHistory")
                     .accessibilityAddTraits(.isButton)
 
                 if account.preferences.fetchBlockingUsers {
@@ -104,7 +104,7 @@ struct AppSidebarAccountsSection: View {
                     blockingsNavigationLink
                         .accessibilityElement(children: .ignore)
                         .accessibilityLabel(blockingTitle)
-                        .accessibilityIdentifier(blockingTitle)
+                        .accessibilityIdentifier("\(displayAccountName):BlocksHistory")
                         .accessibilityAddTraits(.isButton)
                 }
             }