diff --git a/package.json b/package.json
index 668d82a8..f31e53be 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "impro",
-  "version": "0.20.94",
+  "version": "0.20.95",
   "type": "module",
   "scripts": {
     "start": "rm -rf \"${BUILD_DIR:-build}\" && NODE_ENV=development eleventy --serve",
diff --git a/src/js/components/create-list-dialog.js b/src/js/components/create-list-dialog.js
index c16ad59d..aafef98f 100644
--- a/src/js/components/create-list-dialog.js
+++ b/src/js/components/create-list-dialog.js
@@ -295,7 +295,12 @@ class CreateListDialog extends Component {
                 </div>
 
                 ${this._error
-                  ? html`<div class="form-dialog-error">${this._error}</div>`
+                  ? html`<div
+                      class="form-dialog-error"
+                      data-testid="form-dialog-error"
+                    >
+                      ${this._error}
+                    </div>`
                   : ""}
               </div>
             </div>`}
diff --git a/src/js/components/edit-list-details-dialog.js b/src/js/components/edit-list-details-dialog.js
index 157679d8..2a82a6e7 100644
--- a/src/js/components/edit-list-details-dialog.js
+++ b/src/js/components/edit-list-details-dialog.js
@@ -282,7 +282,12 @@ class EditListDetailsDialog extends Component {
                 </div>
 
                 ${this._error
-                  ? html`<div class="form-dialog-error">${this._error}</div>`
+                  ? html`<div
+                      class="form-dialog-error"
+                      data-testid="form-dialog-error"
+                    >
+                      ${this._error}
+                    </div>`
                   : ""}
               </div>
             </div>`}
diff --git a/src/js/components/edit-profile-dialog.js b/src/js/components/edit-profile-dialog.js
index 17bd374a..912022a4 100644
--- a/src/js/components/edit-profile-dialog.js
+++ b/src/js/components/edit-profile-dialog.js
@@ -333,7 +333,12 @@ class EditProfileDialog extends Component {
                 </div>
 
                 ${this._error
-                  ? html`<div class="form-dialog-error">${this._error}</div>`
+                  ? html`<div
+                      class="form-dialog-error"
+                      data-testid="form-dialog-error"
+                    >
+                      ${this._error}
+                    </div>`
                   : ""}
               </div>
             </div>`}
diff --git a/src/js/components/hidden-replies-section.js b/src/js/components/hidden-replies-section.js
index 18660293..e27c31f1 100644
--- a/src/js/components/hidden-replies-section.js
+++ b/src/js/components/hidden-replies-section.js
@@ -26,6 +26,7 @@ class HiddenRepliesSection extends Component {
         >
           <div
             class="hidden-replies-button"
+            data-testid="hidden-replies-button"
             tabindex="0"
             role="button"
             ?hidden=${this.expanded}
diff --git a/src/js/components/moderation-warning.js b/src/js/components/moderation-warning.js
index 1f9739fa..6518b9c0 100644
--- a/src/js/components/moderation-warning.js
+++ b/src/js/components/moderation-warning.js
@@ -51,6 +51,7 @@ class ModerationWarning extends Component {
         ${this.labelerName
           ? html`<div
               class="post-moderation-warning-description"
+              data-testid="moderation-warning-description"
               ?hidden=${this.expanded}
             >
               Labeled by
diff --git a/src/js/components/new-chat-dialog.js b/src/js/components/new-chat-dialog.js
index ea7d9fec..fd2bf0df 100644
--- a/src/js/components/new-chat-dialog.js
+++ b/src/js/components/new-chat-dialog.js
@@ -365,7 +365,11 @@ function chatStepTemplate({
       onInput: onSearchInput,
       onClear: onClearSearch,
     })}
-    <div class="search-dialog-results">
+    <div
+      class="search-dialog-results"
+      data-testid="new-chat-results"
+      data-teststate=${query ? "search" : "suggestions"}
+    >
       ${chatStepResultsTemplate({
         query,
         currentUserDid,
diff --git a/src/js/components/pinned-feeds-pane.js b/src/js/components/pinned-feeds-pane.js
index 4f3a0641..114736f0 100644
--- a/src/js/components/pinned-feeds-pane.js
+++ b/src/js/components/pinned-feeds-pane.js
@@ -28,6 +28,7 @@ function pinnedItemTemplate({ item, isCurrent, onSelect }) {
   return html`<button
     class=${classnames("pinned-feeds-item", { active: isCurrent })}
     data-testid="pinned-feeds-item"
+    data-pinned-value=${item.uri}
     title=${item.displayName}
     @click=${onSelect}
   >
diff --git a/src/js/components/post-composer.js b/src/js/components/post-composer.js
index f7af1a9e..0d7e4d90 100644
--- a/src/js/components/post-composer.js
+++ b/src/js/components/post-composer.js
@@ -385,7 +385,11 @@ function videoPreviewTemplate({ video, onRemove, onEditAltText }) {
           <app-icon icon="close-line"></app-icon>
         </button>
         ${!isReady
-          ? html`<div class="video-preview-overlay">
+          ? html`<div
+              class="video-preview-overlay"
+              data-testid="composer-video-overlay"
+              data-teststate=${video.status}
+            >
               ${!isError ? html`<div class="loading-spinner"></div>` : ""}
               <span>${progressLabel}</span>
             </div>`
diff --git a/src/js/components/starter-pack-wizard-dialog.js b/src/js/components/starter-pack-wizard-dialog.js
index f53dd62e..a3f7170a 100644
--- a/src/js/components/starter-pack-wizard-dialog.js
+++ b/src/js/components/starter-pack-wizard-dialog.js
@@ -192,6 +192,7 @@ function detailsStepTemplate({
       <button
         class="rounded-button rounded-button-primary starter-pack-wizard-next"
         data-testid="starter-pack-wizard-next"
+        data-teststate="next"
         ?disabled=${nameTooLong || descriptionTooLong}
         @click=${onNext}
       >
@@ -257,6 +258,7 @@ function wizardFooterTemplate({
   summary,
   hint,
   buttonLabel,
+  buttonTestState,
   buttonDisabled,
   saving,
   onNext,
@@ -299,6 +301,7 @@ function wizardFooterTemplate({
         { saving },
       )}
       data-testid="starter-pack-wizard-next"
+      data-teststate=${buttonTestState}
       ?disabled=${buttonDisabled}
       @click=${onNext}
     >
@@ -412,6 +415,7 @@ function profilesStepTemplate({
           ? `Add ${missing} more ${missing === 1 ? "person" : "people"} to continue`
           : null,
       buttonLabel: "Next",
+      buttonTestState: "next",
       buttonDisabled: missing > 0 || saving,
       saving: false,
       onNext,
@@ -556,6 +560,7 @@ function feedsStepTemplate({
       summary,
       hint: null,
       buttonLabel: feeds.length === 0 ? "Skip" : "Finish",
+      buttonTestState: feeds.length === 0 ? "skip" : "finish",
       buttonDisabled: saving,
       saving,
       onNext,
diff --git a/src/js/components/tab-bar.js b/src/js/components/tab-bar.js
index 19febe9f..d72f00ff 100644
--- a/src/js/components/tab-bar.js
+++ b/src/js/components/tab-bar.js
@@ -57,6 +57,7 @@ class TabBar extends Component {
               active: activeTab === tab.value,
             })}
             data-testid="tab-${tab.value}"
+            data-teststate=${activeTab === tab.value ? "active" : "inactive"}
             @click=${() => this.#handleTabClick(tab.value)}
           >
             <span class="tab-bar-button-label">${tab.label}</span>
diff --git a/src/js/modals/whoCanReply.modal.js b/src/js/modals/whoCanReply.modal.js
index ce29e778..a8209780 100644
--- a/src/js/modals/whoCanReply.modal.js
+++ b/src/js/modals/whoCanReply.modal.js
@@ -27,10 +27,16 @@ function ruleTemplate({ rule, author, lists }) {
   return html`unknown`;
 }
 
-function threadgateRuleTemplate({ post }) {
-  const settings = normalizeThreadgateAllowSettings(
-    post?.threadgate?.record?.allow,
-  );
+function getThreadgateRuleState(settings) {
+  for (const state of ["everybody", "nobody", "unknown"]) {
+    if (settings.some((rule) => rule.type === state)) {
+      return state;
+    }
+  }
+  return "rules";
+}
+
+function threadgateRuleTemplate({ post, settings }) {
   if (settings.some((rule) => rule.type === "everybody")) {
     return html`Everybody can reply to this post.`;
   }
@@ -52,7 +58,13 @@ function threadgateRuleTemplate({ post }) {
         parts.push(html`, `);
       }
     }
-    parts.push(ruleTemplate({ rule, author, lists }));
+    parts.push(
+      html`<span
+        data-testid="who-can-reply-rule-item"
+        data-teststate=${rule.type}
+        >${ruleTemplate({ rule, author, lists })}</span
+      >`,
+    );
   });
   return html`Only ${parts} can reply.`;
 }
@@ -68,15 +80,24 @@ export class WhoCanReplyModal extends Modal {
 
   render({ dismiss, props: { post } }) {
     const embeddingDisabled = !!post?.viewer?.embeddingDisabled;
+    const settings = normalizeThreadgateAllowSettings(
+      post?.threadgate?.record?.allow,
+    );
     return html`
       <div class="modal-dialog-content">
         <h2 class="modal-dialog-title" data-testid="modal-title">
           Who can interact with this post?
         </h2>
         <div class="modal-dialog-message who-can-reply-body">
-          <span>${threadgateRuleTemplate({ post })}</span>
+          <span
+            data-testid="who-can-reply-rule"
+            data-teststate=${getThreadgateRuleState(settings)}
+            >${threadgateRuleTemplate({ post, settings })}</span
+          >
           ${embeddingDisabled
-            ? html`<span>No one but the author can quote this post.</span>`
+            ? html`<span data-testid="who-can-reply-quote-disabled"
+                >No one but the author can quote this post.</span
+              >`
             : ""}
         </div>
         <div class="modal-dialog-buttons">
diff --git a/src/js/templates/labelerSettings.template.js b/src/js/templates/labelerSettings.template.js
index 69a1af9c..a42d95a7 100644
--- a/src/js/templates/labelerSettings.template.js
+++ b/src/js/templates/labelerSettings.template.js
@@ -100,7 +100,9 @@ export function labelerSettingsTemplate({
           class="labeler-settings-header"
           data-testid="labeler-settings-header"
         >
-          <p>This labeler has no configurable labels.</p>
+          <p data-testid="empty-state">
+            This labeler has no configurable labels.
+          </p>
         </div>
       </div>
     `;
diff --git a/src/js/templates/largePost.template.js b/src/js/templates/largePost.template.js
index 93ac476c..7403058e 100644
--- a/src/js/templates/largePost.template.js
+++ b/src/js/templates/largePost.template.js
@@ -38,12 +38,14 @@ function mutedWarningTemplate({ post, children }) {
   if (post.viewer?.hasMutedWord) {
     return html`<moderation-warning
       label="Post hidden by muted word"
+      data-teststate="muted-word"
       icon-style="closed-eye"
       >${children}</moderation-warning
     > `;
   } else if (post.viewer?.isHidden) {
     return html`<moderation-warning
       label="Post hidden by you"
+      data-teststate="hidden"
       icon-style="closed-eye"
       >${children}</moderation-warning
     > `;
diff --git a/src/js/templates/moderationWarning.template.js b/src/js/templates/moderationWarning.template.js
index aae4f904..38867db6 100644
--- a/src/js/templates/moderationWarning.template.js
+++ b/src/js/templates/moderationWarning.template.js
@@ -19,6 +19,7 @@ export function moderationWarningTemplate({
   const labelerLink = labeler ? linkToLabeler(labeler) : null;
   return html`<moderation-warning
     class=${classnames("post-moderation-warning", className)}
+    data-teststate="label"
     @click=${(e) => {
       const clickedBar = !!e.target.closest(".top-bar");
       if (clickedBar) {
diff --git a/src/js/templates/mutedParentToggle.template.js b/src/js/templates/mutedParentToggle.template.js
index 1a501980..5956816d 100644
--- a/src/js/templates/mutedParentToggle.template.js
+++ b/src/js/templates/mutedParentToggle.template.js
@@ -3,17 +3,26 @@ import "/js/components/muted-parent-toggle.js";
 
 export function mutedParentToggleTemplate({ post, children }) {
   if (post.author?.viewer?.muted) {
-    return html`<muted-parent-toggle label="Muted account">
+    return html`<muted-parent-toggle
+      label="Muted account"
+      data-teststate="muted-account"
+    >
       ${children}
     </muted-parent-toggle>`;
   }
   if (post.viewer?.hasMutedWord) {
-    return html`<muted-parent-toggle label="Hidden by muted word">
+    return html`<muted-parent-toggle
+      label="Hidden by muted word"
+      data-teststate="muted-word"
+    >
       ${children}
     </muted-parent-toggle>`;
   }
   if (post.viewer?.isHidden) {
-    return html`<muted-parent-toggle label="Post hidden by you">
+    return html`<muted-parent-toggle
+      label="Post hidden by you"
+      data-teststate="hidden"
+    >
       ${children}
     </muted-parent-toggle>`;
   }
diff --git a/src/js/templates/postActionBar.template.js b/src/js/templates/postActionBar.template.js
index 6eccbf9e..658bb236 100644
--- a/src/js/templates/postActionBar.template.js
+++ b/src/js/templates/postActionBar.template.js
@@ -333,6 +333,7 @@ function repostMenuTemplate({
     </context-menu-item>
     <context-menu-item
       data-testid="menu-action-quote-post"
+      data-teststate=${canQuotePost ? "quotable" : "quotes-disabled"}
       ?disabled=${!canQuotePost || !currentUser}
       icon="quote-line"
       @click=${() => {
diff --git a/src/js/templates/postEmbed.template.js b/src/js/templates/postEmbed.template.js
index f19c7c25..53122448 100644
--- a/src/js/templates/postEmbed.template.js
+++ b/src/js/templates/postEmbed.template.js
@@ -301,7 +301,9 @@ function imageContainerTemplate({ image, lazyLoad, doCalculateAspectRatio }) {
         : ""}
       loading=${lazyLoad ? "lazy" : "eager"}
     />
-    ${image.alt ? html` <div class="alt-indicator">ALT</div> ` : ""}
+    ${image.alt
+      ? html`<div class="alt-indicator" data-testid="image-alt-badge">ALT</div>`
+      : ""}
   </div>`;
 }
 
diff --git a/src/js/templates/sidebar.template.js b/src/js/templates/sidebar.template.js
index a15746c8..ee11ce2c 100644
--- a/src/js/templates/sidebar.template.js
+++ b/src/js/templates/sidebar.template.js
@@ -318,6 +318,7 @@ export function sidebarTemplate({
               data-testid="sidebar-profile-stats"
             >
               <a
+                data-testid="sidebar-profile-followers"
                 href="${currentUser
                   ? linkToProfileFollowers(currentUser)
                   : "#"}"
@@ -338,6 +339,7 @@ export function sidebarTemplate({
               </a>
               <span class="sidebar-profile-separator">·</span>
               <a
+                data-testid="sidebar-profile-following"
                 href="${currentUser
                   ? linkToProfileFollowing(currentUser)
                   : "#"}"
diff --git a/src/js/templates/smallPost.template.js b/src/js/templates/smallPost.template.js
index 1c680b7f..48e1e0f6 100644
--- a/src/js/templates/smallPost.template.js
+++ b/src/js/templates/smallPost.template.js
@@ -48,6 +48,7 @@ function contentWarningTemplate({
       return html`<moderation-warning
         class="post-muted-warning"
         label="Hidden by muted word"
+        data-teststate="muted-word"
         icon-style="closed-eye"
         @click=${stopClick}
         >${children}</moderation-warning
@@ -57,6 +58,7 @@ function contentWarningTemplate({
       return html`<moderation-warning
         class="post-muted-warning"
         label="Post hidden by you"
+        data-teststate="hidden"
         icon-style="closed-eye"
         @click=${stopClick}
         >${children}</moderation-warning
diff --git a/src/js/templates/whoCanReplyBadge.template.js b/src/js/templates/whoCanReplyBadge.template.js
index 6665318e..7b6b7523 100644
--- a/src/js/templates/whoCanReplyBadge.template.js
+++ b/src/js/templates/whoCanReplyBadge.template.js
@@ -9,14 +9,18 @@ export function whoCanReplyBadgeTemplate({ post, linkStyle = false, onClick }) {
   const isEverybody = settings.some((rule) => rule.type === "everybody");
   let label;
   let icon;
+  let replySetting;
   if (isEverybody) {
     label = "Everybody can reply";
+    replySetting = "everybody";
     icon = html`<app-icon icon="globe-grid-line"></app-icon>`;
   } else if (settings.some((rule) => rule.type === "nobody")) {
     label = "Replies disabled";
+    replySetting = "nobody";
     icon = html`<app-icon icon="users-line"></app-icon>`;
   } else {
     label = "Some people can reply";
+    replySetting = "limited";
     icon = html`<app-icon icon="users-line"></app-icon>`;
   }
   return html`
@@ -24,7 +28,7 @@ export function whoCanReplyBadgeTemplate({ post, linkStyle = false, onClick }) {
       type="button"
       class="who-can-reply-badge ${linkStyle ? "who-can-reply-badge-link" : ""}"
       data-testid="who-can-reply-badge"
-      data-teststate=${linkStyle ? "link" : "plain"}
+      data-teststate=${replySetting}
       @click=${(event) => {
         event.stopPropagation();
         onClick(post);
diff --git a/src/js/toasts.js b/src/js/toasts.js
index 3095ba05..1cd65f8d 100644
--- a/src/js/toasts.js
+++ b/src/js/toasts.js
@@ -123,6 +123,7 @@ export function showToast(
   const toast = document.createElement("div");
   toast.classList.add("toast", style);
   toast.dataset.testid = "toast";
+  toast.dataset.teststate = style;
   const resolvedIconTemplate =
     iconTemplate ?? STYLE_ICONS[style] ?? STYLE_ICONS.default;
   render(
diff --git a/src/js/views/chat.view.js b/src/js/views/chat.view.js
index ab189855..6f103630 100644
--- a/src/js/views/chat.view.js
+++ b/src/js/views/chat.view.js
@@ -164,7 +164,10 @@ export default async function chatView({
       renderItem: (convo) => convoItemTemplate({ convo, currentUser }),
       hasMore,
       onLoadMore: loadConvoList,
-      emptyTemplate: html`<div class="feed-end-message">
+      emptyTemplate: html`<div
+        class="feed-end-message"
+        data-testid="empty-state"
+      >
         <div>No conversations yet!</div>
         <button
           class="rounded-button rounded-button-primary"
@@ -179,7 +182,7 @@ export default async function chatView({
 
   function convosErrorTemplate({ error }) {
     console.error(error);
-    return html`<div class="error-state">
+    return html`<div class="error-state" data-testid="convo-list-error">
       <div>There was an error loading conversations.</div>
       ${tryAgainButtonTemplate()}
     </div>`;
diff --git a/src/js/views/chatRequests.view.js b/src/js/views/chatRequests.view.js
index b58c98a5..7becae13 100644
--- a/src/js/views/chatRequests.view.js
+++ b/src/js/views/chatRequests.view.js
@@ -130,6 +130,7 @@ export default async function chatRequestsView({
           ${canAccept
             ? html`<button
                 class="chat-request-button accept"
+                data-testid="chat-request-accept-button"
                 @click=${(e) => {
                   e.stopPropagation();
                   handleAccept(convo);
@@ -140,6 +141,7 @@ export default async function chatRequestsView({
             : ""}
           <button
             class="chat-request-button reject"
+            data-testid="chat-request-reject-button"
             @click=${(e) => {
               e.stopPropagation();
               handleReject(convo);
@@ -193,7 +195,7 @@ export default async function chatRequestsView({
 
   function requestsErrorTemplate({ error }) {
     console.error(error);
-    return html`<div class="error-state">
+    return html`<div class="error-state" data-testid="chat-requests-error">
       <div>There was an error loading chat requests.</div>
       ${tryAgainButtonTemplate()}
     </div>`;
diff --git a/src/js/views/communityPluginListing.view.js b/src/js/views/communityPluginListing.view.js
index 553eb3f7..f2515fbf 100644
--- a/src/js/views/communityPluginListing.view.js
+++ b/src/js/views/communityPluginListing.view.js
@@ -113,9 +113,14 @@ export default async function communityPluginListingView({
     const installButtonClass = listing.installed
       ? "plugin-install-button rounded-button"
       : "plugin-install-button rounded-button rounded-button-primary";
+    let testState = listing.installed ? "installed" : "not-installed";
+    if (pendingAction) {
+      testState = pendingAction === "uninstall" ? "uninstalling" : "installing";
+    }
     return html`<button
       class=${installButtonClass}
       data-testid="plugin-listing-install-button"
+      data-teststate=${testState}
       ?disabled=${pendingAction !== null}
       @click=${() => toggleInstall(listing)}
     >
@@ -174,7 +179,10 @@ export default async function communityPluginListingView({
         <main>
           ${(() => {
             if (loadError) {
-              return html`<div class="error-state">
+              return html`<div
+                class="error-state"
+                data-testid="plugin-listing-error"
+              >
                 <div>Failed to load plugin</div>
                 ${tryAgainButtonTemplate()}
               </div>`;
diff --git a/src/js/views/communityPlugins.view.js b/src/js/views/communityPlugins.view.js
index 47f64070..98015c69 100644
--- a/src/js/views/communityPlugins.view.js
+++ b/src/js/views/communityPlugins.view.js
@@ -67,7 +67,10 @@ export default async function communityPluginsView({
               </div>`
             : ""}
           ${error
-            ? html`<div class="error-state">
+            ? html`<div
+                class="error-state"
+                data-testid="community-plugins-error"
+              >
                 <div>Failed to load plugins</div>
                 <button
                   class="rounded-button rounded-button-secondary-inverted"
diff --git a/src/js/views/feeds.view.js b/src/js/views/feeds.view.js
index 44824bf3..0e9489cd 100644
--- a/src/js/views/feeds.view.js
+++ b/src/js/views/feeds.view.js
@@ -251,7 +251,9 @@ export default async function feedsView({
           },
         })}
         <main>
-          <div class="feeds-list-header">Pinned Feeds</div>
+          <div class="feeds-list-header" data-testid="feeds-list-header">
+            Pinned Feeds
+          </div>
           ${paginatedListTemplate({
             items: orderedItems,
             renderItem: (item) => {
diff --git a/src/js/views/groupChatDetails.view.js b/src/js/views/groupChatDetails.view.js
index 669b1311..9db92839 100644
--- a/src/js/views/groupChatDetails.view.js
+++ b/src/js/views/groupChatDetails.view.js
@@ -52,6 +52,7 @@ function memberTrailingTemplate({ member, ownerDid }) {
   return html`<div
     class="group-chat-member-added-by"
     data-testid="member-added-by"
+    data-teststate=${addedBy ? "member" : "invite-link"}
   >
     ${addedBy ? `Added by ${getDisplayName(addedBy)}` : "Added by invite link"}
   </div>`;
diff --git a/src/js/views/home.view.js b/src/js/views/home.view.js
index 97ca64f0..7d44dbbc 100644
--- a/src/js/views/home.view.js
+++ b/src/js/views/home.view.js
@@ -173,7 +173,7 @@ export default async function homeView({
   }
 
   function feedErrorTemplate({ feedGenerator }) {
-    return html`<div class="error-state">
+    return html`<div class="error-state" data-testid="feed-error">
       An issue occurred when contacting the feed server.<br />
       Please let the feed owner know about this issue.<br />
       ${feedGenerator.creator
diff --git a/src/js/views/installedPlugins.view.js b/src/js/views/installedPlugins.view.js
index 99c167b0..bf69c77a 100644
--- a/src/js/views/installedPlugins.view.js
+++ b/src/js/views/installedPlugins.view.js
@@ -192,6 +192,14 @@ export default async function installedPluginsView({
                     <div class="installed-plugins-header-actions">
                       <button
                         class="plugin-check-updates-button rounded-button rounded-button-primary"
+                        data-testid="plugin-check-updates-button"
+                        data-teststate=${checkingForUpdates || updatingAll
+                          ? hasAvailableUpdates
+                            ? "updating"
+                            : "checking"
+                          : hasAvailableUpdates
+                            ? "update-all"
+                            : "check"}
                         ?disabled=${checkingForUpdates || updatingAll}
                         @click=${() =>
                           hasAvailableUpdates
diff --git a/src/js/views/login.view.js b/src/js/views/login.view.js
index 9bbf50af..33b0bb6d 100644
--- a/src/js/views/login.view.js
+++ b/src/js/views/login.view.js
@@ -251,7 +251,7 @@ export default async function loginView({
       html`<div id="login-view">
         <main>
           <div class="column-left">
-            <h1>Sign in</h1>
+            <h1 data-testid="login-title">Sign in</h1>
             <h2><small>to</small> IMPRO</h2>
           </div>
           <div class="column-right">
@@ -372,6 +372,7 @@ export default async function loginView({
                 <button
                   class="rounded-button rounded-button-secondary"
                   type="button"
+                  data-testid="login-back-button"
                   @click=${() => handleBack()}
                 >
                   Back
@@ -379,6 +380,7 @@ export default async function loginView({
                 <button
                   class="rounded-button rounded-button-primary"
                   type="submit"
+                  data-testid="login-next-button"
                   ?disabled=${loading}
                 >
                   Next
diff --git a/src/js/views/notifications.view.js b/src/js/views/notifications.view.js
index 910453c0..dbca0964 100644
--- a/src/js/views/notifications.view.js
+++ b/src/js/views/notifications.view.js
@@ -50,17 +50,25 @@ import "/js/components/container-link.js";
 import { tryAgainButtonTemplate } from "/js/templates/tryAgainButton.template.js";
 import { showToast } from "/js/toasts.js";
 
-function notificationItemTemplate({ href, isUnread, children }) {
+function notificationItemTemplate({ type, href, isUnread, children }) {
   const unreadClass = isUnread ? "unread" : "";
   if (href) {
     return html`<container-link
       class="notification-item notification-item-clickable ${unreadClass}"
+      data-testid="notification-item"
+      data-teststate=${type}
       href=${href}
     >
       ${children}
     </container-link>`;
   }
-  return html`<div class="notification-item ${unreadClass}">${children}</div>`;
+  return html`<div
+    class="notification-item ${unreadClass}"
+    data-testid="notification-item"
+    data-teststate=${type}
+  >
+    ${children}
+  </div>`;
 }
 
 export default async function notificationsView({
@@ -355,7 +363,11 @@ export default async function notificationsView({
     const timeAgo = formatRelativeTime(firstNotif.indexedAt);
     const isUnread = !firstNotif.isRead;
     return html`
-      <div class="notification-item ${isUnread ? "unread" : ""}">
+      <div
+        class="notification-item ${isUnread ? "unread" : ""}"
+        data-testid="notification-item"
+        data-teststate=${notificationGroup.type}
+      >
         <div class="notification-icon">
           <app-icon icon="user-plus"></app-icon>
         </div>
@@ -407,6 +419,7 @@ export default async function notificationsView({
     const timeAgo = formatRelativeTime(firstNotif.indexedAt);
     const isUnread = !firstNotif.isRead;
     return notificationItemTemplate({
+      type: notificationGroup.type,
       href: linkToNotificationActivity(
         notifications.map((notification) => notification.post.uri),
       ),
@@ -441,6 +454,7 @@ export default async function notificationsView({
     const likedPost = firstNotif.subject;
 
     return notificationItemTemplate({
+      type: notificationGroup.type,
       href: isUnavailablePost(likedPost) ? null : linkToPost(likedPost),
       isUnread,
       children: html`
@@ -472,6 +486,7 @@ export default async function notificationsView({
     // Get the reposted post for preview
     const repostedPost = firstNotif.subject;
     return notificationItemTemplate({
+      type: notificationGroup.type,
       href: isUnavailablePost(repostedPost) ? null : linkToPost(repostedPost),
       isUnread,
       children: html`
@@ -526,6 +541,7 @@ export default async function notificationsView({
     const subjectLink = repo && rkey ? `/profile/${repo}/feed/${rkey}` : null;
 
     return notificationItemTemplate({
+      type: notificationGroup.type,
       href: subjectLink,
       isUnread,
       children: html`
@@ -558,6 +574,7 @@ export default async function notificationsView({
       repo && rkey ? `/profile/${repo}/starter-pack/${rkey}` : null;
 
     return notificationItemTemplate({
+      type: notificationGroup.type,
       href: subjectLink,
       isUnread,
       children: html`
@@ -586,7 +603,11 @@ export default async function notificationsView({
     const isUnread = !firstNotif.isRead;
 
     return html`
-      <div class="notification-item ${isUnread ? "unread" : ""}">
+      <div
+        class="notification-item ${isUnread ? "unread" : ""}"
+        data-testid="notification-item"
+        data-teststate=${notificationGroup.type}
+      >
         <div class="notification-icon verified-icon">
           <app-icon icon="verified-check"></app-icon>
         </div>
@@ -613,7 +634,11 @@ export default async function notificationsView({
     const otherCount = notifications.length - 1;
 
     return html`
-      <div class="notification-item ${isUnread ? "unread" : ""}">
+      <div
+        class="notification-item ${isUnread ? "unread" : ""}"
+        data-testid="notification-item"
+        data-teststate=${notificationGroup.type}
+      >
         <div class="notification-icon unverified-icon">
           <app-icon icon="verified-check"></app-icon>
         </div>
@@ -642,6 +667,7 @@ export default async function notificationsView({
     const profileLink = linkToProfile(firstNotif.author);
 
     return notificationItemTemplate({
+      type: notificationGroup.type,
       href: profileLink,
       isUnread,
       children: html`
@@ -718,7 +744,7 @@ export default async function notificationsView({
 
   function notificationsErrorTemplate({ error }) {
     console.error(error);
-    return html`<div class="error-state">
+    return html`<div class="error-state" data-testid="notifications-error">
       <div>There was an error loading notifications.</div>
       ${tryAgainButtonTemplate()}
     </div>`;
diff --git a/src/js/views/postLikes.view.js b/src/js/views/postLikes.view.js
index 1a04981d..c7b9dfb2 100644
--- a/src/js/views/postLikes.view.js
+++ b/src/js/views/postLikes.view.js
@@ -28,7 +28,7 @@ export default async function postLikesView({
 
   function likesErrorTemplate({ error }) {
     console.error(error);
-    return html`<div class="error-state">
+    return html`<div class="error-state" data-testid="likes-error">
       <div>Error loading likes</div>
       ${tryAgainButtonTemplate()}
     </div>`;
diff --git a/src/js/views/postQuotes.view.js b/src/js/views/postQuotes.view.js
index 3c249ff5..a331450e 100644
--- a/src/js/views/postQuotes.view.js
+++ b/src/js/views/postQuotes.view.js
@@ -29,7 +29,7 @@ export default async function postQuotesView({
 
   function quotesErrorTemplate({ error }) {
     console.error(error);
-    return html`<div class="error-state">
+    return html`<div class="error-state" data-testid="quotes-error">
       <div>Error loading quotes</div>
       ${tryAgainButtonTemplate()}
     </div>`;
diff --git a/src/js/views/postReposts.view.js b/src/js/views/postReposts.view.js
index 2055209e..08fbead0 100644
--- a/src/js/views/postReposts.view.js
+++ b/src/js/views/postReposts.view.js
@@ -28,7 +28,7 @@ export default async function postRepostsView({
 
   function repostsErrorTemplate({ error }) {
     console.error(error);
-    return html`<div class="error-state">
+    return html`<div class="error-state" data-testid="reposts-error">
       <div>Error loading reposts</div>
       ${tryAgainButtonTemplate()}
     </div>`;
diff --git a/src/js/views/postThread.view.js b/src/js/views/postThread.view.js
index 8c1868e2..13764775 100644
--- a/src/js/views/postThread.view.js
+++ b/src/js/views/postThread.view.js
@@ -567,7 +567,10 @@ export default async function postThreadView({
             : ""}
         </div>
         <div class="post-content-right">
-          <div class="no-unauthenticated-message">
+          <div
+            class="no-unauthenticated-message"
+            data-testid="no-unauthenticated-message"
+          >
             ${NO_UNAUTHENTICATED_MESSAGE}
           </div>
         </div>
@@ -586,7 +589,10 @@ export default async function postThreadView({
           <div class="skeleton-line skeleton-line-medium"></div>
         </div>
       </div>
-      <div class="no-unauthenticated-message no-unauthenticated-message-large">
+      <div
+        class="no-unauthenticated-message no-unauthenticated-message-large"
+        data-testid="no-unauthenticated-message"
+      >
         ${NO_UNAUTHENTICATED_MESSAGE}
       </div>
     </div>`;
@@ -723,6 +729,7 @@ export default async function postThreadView({
               ? html`
                   <div
                     class="post-thread-reply-prompt"
+                    data-testid="post-thread-reply-prompt"
                     @click=${async () => {
                       await handleClickReply(mainPost, root, currentUser);
                     }}
diff --git a/src/js/views/profile.view.js b/src/js/views/profile.view.js
index 3cd27995..d35eb486 100644
--- a/src/js/views/profile.view.js
+++ b/src/js/views/profile.view.js
@@ -228,14 +228,14 @@ export default async function profileView({
   function profileErrorTemplate({ error }) {
     if (isNotFoundError(error)) {
       const message = getNotFoundMessage(error);
-      return html`<div class="error-state">
+      return html`<div class="error-state" data-testid="profile-not-found">
         <h3>Not Found</h3>
         <div>${message}</div>
         ${tryAgainButtonTemplate()}
       </div>`;
     }
     console.error(error);
-    return html`<div class="error-state">
+    return html`<div class="error-state" data-testid="profile-error">
       <div>There was an error loading the profile.</div>
       ${tryAgainButtonTemplate()}
     </div>`;
@@ -243,7 +243,7 @@ export default async function profileView({
 
   function profileUnavailableTemplate() {
     return html`
-      <div class="error-state">
+      <div class="error-state" data-testid="profile-sign-in-required">
         <h1>Sign-In Required</h1>
         <p>
           This account has requested that users sign in to view their profile.
@@ -374,7 +374,12 @@ export default async function profileView({
           })}
           ${isBlocking || isBlockedBy
             ? html`<div class="feed">
-                <div class="feed-end-message">Posts hidden</div>
+                <div
+                  class="feed-end-message"
+                  data-testid="profile-posts-hidden"
+                >
+                  Posts hidden
+                </div>
               </div>`
             : html`
                 <div class="profile-tab-bar" data-scroll-lock-sticky>
diff --git a/src/js/views/profileFollowers.view.js b/src/js/views/profileFollowers.view.js
index 7213bf08..40ba720d 100644
--- a/src/js/views/profileFollowers.view.js
+++ b/src/js/views/profileFollowers.view.js
@@ -30,7 +30,7 @@ export default async function profileFollowersView({
 
   function followersErrorTemplate({ error }) {
     console.error(error);
-    return html`<div class="error-state">
+    return html`<div class="error-state" data-testid="followers-error">
       <div>Error loading followers</div>
       ${tryAgainButtonTemplate()}
     </div>`;
diff --git a/src/js/views/profileFollowing.view.js b/src/js/views/profileFollowing.view.js
index 532ab8fb..ee9f4fde 100644
--- a/src/js/views/profileFollowing.view.js
+++ b/src/js/views/profileFollowing.view.js
@@ -30,7 +30,7 @@ export default async function profileFollowingView({
 
   function followingErrorTemplate({ error }) {
     console.error(error);
-    return html`<div class="error-state">
+    return html`<div class="error-state" data-testid="following-error">
       <div>Error loading following</div>
       ${tryAgainButtonTemplate()}
     </div>`;
diff --git a/src/js/views/profileKnownFollowers.view.js b/src/js/views/profileKnownFollowers.view.js
index dbad51aa..ecda8fef 100644
--- a/src/js/views/profileKnownFollowers.view.js
+++ b/src/js/views/profileKnownFollowers.view.js
@@ -30,7 +30,7 @@ export default async function profileKnownFollowersView({
 
   function errorTemplate({ error }) {
     console.error(error);
-    return html`<div class="error-state">
+    return html`<div class="error-state" data-testid="known-followers-error">
       <div>Error loading followers you know</div>
       ${tryAgainButtonTemplate()}
     </div>`;
diff --git a/src/js/views/search.view.js b/src/js/views/search.view.js
index 97b56504..addb521f 100644
--- a/src/js/views/search.view.js
+++ b/src/js/views/search.view.js
@@ -550,6 +550,8 @@ export default async function searchView({
         "rounded-button-primary": !isPinned,
         pinned: isPinned,
       })}
+      data-testid="pin-feed-button"
+      data-teststate=${isPinned ? "pinned" : "not-pinned"}
       @click=${(e) => {
         e.stopPropagation();
         feedInteractionHandler.handlePinFeed(feedGenerator.uri, !isPinned);
diff --git a/src/js/views/settings.view.js b/src/js/views/settings.view.js
index 81ad0cce..f367af7b 100644
--- a/src/js/views/settings.view.js
+++ b/src/js/views/settings.view.js
@@ -48,7 +48,11 @@ export default async function settingsView({
       <button
         class="vertical-nav-item"
         data-testid="settings-switch-account-toggle"
-        data-teststate=${expanded ? "expanded" : "collapsed"}
+        data-teststate=${hasOthers
+          ? expanded
+            ? "expanded"
+            : "collapsed"
+          : "add"}
         aria-expanded=${hasOthers ? (expanded ? "true" : "false") : null}
         @click=${hasOthers ? onToggle : onAdd}
       >
diff --git a/src/js/views/settings/advanced.view.js b/src/js/views/settings/advanced.view.js
index 76eed55b..0252db98 100644
--- a/src/js/views/settings/advanced.view.js
+++ b/src/js/views/settings/advanced.view.js
@@ -298,6 +298,7 @@ export default async function settingsAdvancedView({
                 <button
                   type="submit"
                   class="rounded-button rounded-button-primary settings-button"
+                  data-testid="appview-save-button"
                   ?disabled=${state.$loading.get() || !isDirty()}
                 >
                   Save and reload
diff --git a/src/js/views/settings/blockedAccounts.view.js b/src/js/views/settings/blockedAccounts.view.js
index bf1172ff..4337afeb 100644
--- a/src/js/views/settings/blockedAccounts.view.js
+++ b/src/js/views/settings/blockedAccounts.view.js
@@ -26,7 +26,7 @@ export default async function settingsBlockedAccountsView({
 
   function errorTemplate({ error }) {
     console.error(error);
-    return html`<div class="error-state">
+    return html`<div class="error-state" data-testid="blocked-accounts-error">
       <div>Error loading blocked accounts</div>
       ${tryAgainButtonTemplate()}
     </div>`;
diff --git a/src/js/views/settings/mutedAccounts.view.js b/src/js/views/settings/mutedAccounts.view.js
index 637bbad0..7f530e51 100644
--- a/src/js/views/settings/mutedAccounts.view.js
+++ b/src/js/views/settings/mutedAccounts.view.js
@@ -26,7 +26,7 @@ export default async function settingsMutedAccountsView({
 
   function errorTemplate({ error }) {
     console.error(error);
-    return html`<div class="error-state">
+    return html`<div class="error-state" data-testid="muted-accounts-error">
       <div>Error loading muted accounts</div>
       ${tryAgainButtonTemplate()}
     </div>`;
diff --git a/src/js/views/settings/mutedWords.view.js b/src/js/views/settings/mutedWords.view.js
index fa9005ce..733f77c8 100644
--- a/src/js/views/settings/mutedWords.view.js
+++ b/src/js/views/settings/mutedWords.view.js
@@ -144,31 +144,47 @@ export default async function settingsMutedWordsView({
     onRemove,
     onRenew,
   }) {
-    const targetLabel = word.targets.includes("content")
-      ? "text & tags"
-      : "tags";
+    const includesContent = word.targets.includes("content");
+    const targetLabel = includesContent ? "text & tags" : "tags";
     const hasExpiration = !!word.expiresAt;
     const hasExcludeFollowing = word.actorTarget === "exclude-following";
+    const expirationDate = word.expiresAt ? new Date(word.expiresAt) : null;
+    const isExpired = expirationDate && expirationDate < new Date();
     const metaParts = [];
     if (hasExpiration) {
-      metaParts.push(formatExpiration(word.expiresAt));
+      metaParts.push(
+        html`<span
+          data-testid="muted-word-item-expiration"
+          data-teststate=${isExpired ? "expired" : "active"}
+          >${formatExpiration(word.expiresAt)}</span
+        >`,
+      );
     }
     if (hasExcludeFollowing) {
-      metaParts.push("Excludes users you follow");
+      metaParts.push(
+        html`<span data-testid="muted-word-item-exclude-following"
+          >Excludes users you follow</span
+        >`,
+      );
     }
-    const expirationDate = word.expiresAt ? new Date(word.expiresAt) : null;
-    const isExpired = expirationDate && expirationDate < new Date();
 
     return html`
       <div class="muted-word-item" data-testid="muted-word-item">
         <div class="muted-word-item-info">
           <div class="muted-word-item-value">
             ${word.value}
-            <span class="muted-word-item-target">in ${targetLabel}</span>
+            <span
+              class="muted-word-item-target"
+              data-testid="muted-word-item-target"
+              data-teststate=${includesContent ? "content-and-tags" : "tags"}
+              >in ${targetLabel}</span
+            >
           </div>
           ${metaParts.length > 0
             ? html`<div class="muted-word-item-meta">
-                ${metaParts.join(" • ")}
+                ${metaParts.map(
+                  (part, i) => html`${i > 0 ? " • " : ""}${part}`,
+                )}
               </div>`
             : ""}
         </div>
diff --git a/src/js/views/starterPackDetail.view.js b/src/js/views/starterPackDetail.view.js
index cbe7c25c..ced45cd3 100644
--- a/src/js/views/starterPackDetail.view.js
+++ b/src/js/views/starterPackDetail.view.js
@@ -163,6 +163,7 @@ function starterPackHeaderTemplate({
         <div
           class="starter-pack-detail-creator"
           data-testid="starter-pack-creator"
+          data-teststate=${isOwner ? "self" : "other"}
         >
           Starter pack by
           ${isOwner
diff --git a/tests/e2e/specs/concerns/blockedPosts.test.js b/tests/e2e/specs/concerns/blockedPosts.test.js
index 28525e81..b1268e01 100644
--- a/tests/e2e/specs/concerns/blockedPosts.test.js
+++ b/tests/e2e/specs/concerns/blockedPosts.test.js
@@ -74,9 +74,9 @@ test.describe("Blocked posts in post thread", () => {
       await expect(view.locator('[data-testid="large-post"]')).toBeVisible({
         timeout: 10000,
       });
-      await expect(view.locator(".missing-post-indicator")).toContainText(
-        "Blocked",
-      );
+      await expect(
+        view.locator('[data-testid="post-tombstone-blocked"]'),
+      ).toBeVisible();
     });
 
     test.describe("when the current user is blocked by a parent author", () => {
@@ -150,9 +150,9 @@ test.describe("Blocked posts in post thread", () => {
         await expect(view.locator('[data-testid="large-post"]')).toBeVisible({
           timeout: 10000,
         });
-        await expect(view.locator(".missing-post-indicator")).toContainText(
-          "Blocked",
-        );
+        await expect(
+          view.locator('[data-testid="post-tombstone-blocked"]'),
+        ).toBeVisible();
         // The chain is severed at the blocked post so grandparent is not reachable
         await expect(view).not.toContainText("Grandparent post");
       });
@@ -253,9 +253,9 @@ test.describe("Blocked posts in post thread", () => {
           timeout: 10000,
         });
         // Blocked post shown as unavailable
-        await expect(view.locator(".missing-post-indicator")).toContainText(
-          "Blocked",
-        );
+        await expect(
+          view.locator('[data-testid="post-tombstone-blocked"]'),
+        ).toBeVisible();
         // Root is not reachable past the blocked post
         await expect(view).not.toContainText("Root of the conversation");
       });
diff --git a/tests/e2e/specs/concerns/listDialogsEdgeCases.test.js b/tests/e2e/specs/concerns/listDialogsEdgeCases.test.js
index 8eb69ff6..424eab65 100644
--- a/tests/e2e/specs/concerns/listDialogsEdgeCases.test.js
+++ b/tests/e2e/specs/concerns/listDialogsEdgeCases.test.js
@@ -166,9 +166,8 @@ test.describe("List creation edge cases", () => {
     await dialog.locator('[data-testid="create-list-name"]').fill("Will Fail");
     await dialog.locator('[data-testid="create-list-save-button"]').click();
 
-    const errorBanner = dialog.locator(".form-dialog-error");
+    const errorBanner = dialog.locator('[data-testid="form-dialog-error"]');
     await expect(errorBanner).toBeVisible({ timeout: 10000 });
-    await expect(errorBanner).toContainText("Failed to create list");
 
     // Dialog stays open and the user is not navigated away.
     await expect(dialog.locator(".create-list-dialog")).toBeVisible();
@@ -340,9 +339,8 @@ test.describe("List edit edge cases", () => {
       .locator('[data-testid="edit-list-details-save-button"]')
       .click();
 
-    const errorBanner = dialog.locator(".form-dialog-error");
+    const errorBanner = dialog.locator('[data-testid="form-dialog-error"]');
     await expect(errorBanner).toBeVisible({ timeout: 10000 });
-    await expect(errorBanner).toContainText("Failed to save list");
 
     await expect(dialog.locator(".edit-list-details-dialog")).toBeVisible();
     await expect(
diff --git a/tests/e2e/specs/concerns/pinnedFeedsPane.test.js b/tests/e2e/specs/concerns/pinnedFeedsPane.test.js
index 7dd886bd..25740503 100644
--- a/tests/e2e/specs/concerns/pinnedFeedsPane.test.js
+++ b/tests/e2e/specs/concerns/pinnedFeedsPane.test.js
@@ -36,7 +36,10 @@ test.describe("Pinned feeds pane", () => {
     await expect(pane).toBeVisible();
     const items = pane.locator('[data-testid="pinned-feeds-item"]');
     await expect(items).toHaveCount(2, { timeout: 10000 });
-    await expect(items.nth(0)).toContainText("Following");
+    await expect(items.nth(0)).toHaveAttribute(
+      "data-pinned-value",
+      "following",
+    );
     await expect(items.nth(1)).toContainText("Trending");
     await expect(
       pane.locator('[data-testid="pinned-feeds-more"]'),
@@ -48,8 +51,9 @@ test.describe("Pinned feeds pane", () => {
   }) => {
     await page.goto("/");
     const view = page.locator("#home-view");
-    await expect(view.locator(".tab-bar-button.active")).toContainText(
-      "Following",
+    await expect(view.locator('[data-testid="tab-following"]')).toHaveAttribute(
+      "data-teststate",
+      "active",
       { timeout: 10000 },
     );
 
diff --git a/tests/e2e/specs/concerns/postComposerEdgeCases.test.js b/tests/e2e/specs/concerns/postComposerEdgeCases.test.js
index 594dbec7..2a3dd396 100644
--- a/tests/e2e/specs/concerns/postComposerEdgeCases.test.js
+++ b/tests/e2e/specs/concerns/postComposerEdgeCases.test.js
@@ -224,11 +224,6 @@ test.describe("Post Composer Edge Cases", () => {
         '[data-testid="composer-submit-button"][data-teststate="reply"]',
       ),
     ).toBeVisible();
-
-    // Verify placeholder says "Write your reply"
-    await expect(
-      composer.locator(".rich-text-input-placeholder"),
-    ).toContainText("Write your reply");
   });
 
   test("post creation error handling — failed creation shows error feedback", async ({
diff --git a/tests/e2e/specs/concerns/postEmbeds.test.js b/tests/e2e/specs/concerns/postEmbeds.test.js
index a85845d9..b5cb8d7e 100644
--- a/tests/e2e/specs/concerns/postEmbeds.test.js
+++ b/tests/e2e/specs/concerns/postEmbeds.test.js
@@ -831,7 +831,6 @@ test.describe("Post embeds view — feed generator / list", () => {
     await expect(action).toHaveAttribute("data-teststate", "request", {
       timeout: 10000,
     });
-    await expect(action).toContainText("Request to join");
   });
 
   test("renders disabled state when the chat is full", async ({ page }) => {
diff --git a/tests/e2e/specs/flows/blockUser.test.js b/tests/e2e/specs/flows/blockUser.test.js
index ca4272de..e25003ff 100644
--- a/tests/e2e/specs/flows/blockUser.test.js
+++ b/tests/e2e/specs/flows/blockUser.test.js
@@ -58,10 +58,10 @@ test.describe("Block user flow", () => {
     // Wait for the profile to show blocked state
     await expect(
       profileView.locator('[data-testid="blocked-badge"]'),
-    ).toContainText("You are blocking this user", { timeout: 10000 });
+    ).toBeVisible({ timeout: 10000 });
     await expect(
       profileView.locator('[data-testid="unblock-button"]'),
-    ).toContainText("Unblock");
+    ).toBeVisible();
 
     // Navigate back to home and verify posts are hidden
     await page.goto("/");
@@ -73,7 +73,7 @@ test.describe("Block user flow", () => {
     await page.goto(`/profile/${otherUser.did}`);
     await expect(
       profileView.locator('[data-testid="blocked-badge"]'),
-    ).toContainText("You are blocking this user", { timeout: 10000 });
+    ).toBeVisible({ timeout: 10000 });
   });
 
   test("should block a user from a post context menu and filter their posts", async ({
@@ -131,10 +131,10 @@ test.describe("Block user flow", () => {
     const profileView = page.locator("#profile-view");
     await expect(
       profileView.locator('[data-testid="blocked-badge"]'),
-    ).toContainText("You are blocking this user", { timeout: 10000 });
+    ).toBeVisible({ timeout: 10000 });
     await expect(
       profileView.locator('[data-testid="unblock-button"]'),
-    ).toContainText("Unblock");
+    ).toBeVisible();
   });
 
   test("should not block the user when the confirmation dialog is cancelled", async ({
@@ -444,7 +444,7 @@ test.describe("Block user flow", () => {
     const profileView = page.locator("#profile-view");
     await expect(
       profileView.locator('[data-testid="blocked-badge"]'),
-    ).toContainText("You are blocking this user", { timeout: 10000 });
+    ).toBeVisible({ timeout: 10000 });
 
     await profileView.locator('[data-testid="unblock-button"]').click();
 
diff --git a/tests/e2e/specs/flows/bookmarkPost.test.js b/tests/e2e/specs/flows/bookmarkPost.test.js
index cca4033a..21814ef9 100644
--- a/tests/e2e/specs/flows/bookmarkPost.test.js
+++ b/tests/e2e/specs/flows/bookmarkPost.test.js
@@ -83,6 +83,6 @@ test.describe("Bookmark post flow", () => {
 
     await expect(
       bookmarksView.locator('[data-testid="empty-state"]'),
-    ).toContainText("No saved posts yet!", { timeout: 10000 });
+    ).toBeVisible({ timeout: 10000 });
   });
 });
diff --git a/tests/e2e/specs/flows/chatRequestAccept.test.js b/tests/e2e/specs/flows/chatRequestAccept.test.js
index 13d54dab..55c41f20 100644
--- a/tests/e2e/specs/flows/chatRequestAccept.test.js
+++ b/tests/e2e/specs/flows/chatRequestAccept.test.js
@@ -39,10 +39,9 @@ test.describe("Chat request accept flow", () => {
     // appear in the main list
     await page.goto("/messages");
     const chatView = page.locator("#chat-view");
-    await expect(chatView.locator(".feed-end-message")).toContainText(
-      "No conversations yet!",
-      { timeout: 10000 },
-    );
+    await expect(chatView.locator('[data-testid="empty-state"]')).toBeVisible({
+      timeout: 10000,
+    });
     await expect(chatView.locator(".convo-item")).toHaveCount(0);
 
     // Navigate to chat requests via the header inbox button
@@ -101,10 +100,9 @@ test.describe("Chat request accept flow", () => {
 
     await page.goto("/messages");
     const chatView = page.locator("#chat-view");
-    await expect(chatView.locator(".feed-end-message")).toContainText(
-      "No conversations yet!",
-      { timeout: 10000 },
-    );
+    await expect(chatView.locator('[data-testid="empty-state"]')).toBeVisible({
+      timeout: 10000,
+    });
     await expect(chatView.locator(".convo-item")).toHaveCount(0);
 
     await chatView.locator('[data-testid="inbox-button"]').click();
@@ -171,10 +169,9 @@ test.describe("Chat request accept flow", () => {
     // The invite surfaces in the requests inbox, not the main list
     await page.goto("/messages");
     const chatView = page.locator("#chat-view");
-    await expect(chatView.locator(".feed-end-message")).toContainText(
-      "No conversations yet!",
-      { timeout: 10000 },
-    );
+    await expect(chatView.locator('[data-testid="empty-state"]')).toBeVisible({
+      timeout: 10000,
+    });
     await expect(chatView.locator(".convo-item")).toHaveCount(0);
 
     await chatView.locator('[data-testid="inbox-button"]').click();
diff --git a/tests/e2e/specs/flows/createGroupChat.test.js b/tests/e2e/specs/flows/createGroupChat.test.js
index c7c119b8..d96830f1 100644
--- a/tests/e2e/specs/flows/createGroupChat.test.js
+++ b/tests/e2e/specs/flows/createGroupChat.test.js
@@ -181,9 +181,6 @@ test.describe("Create group chat flow", () => {
 
     const alertModal = page.locator('[data-testid="alert-modal"]');
     await expect(alertModal).toBeVisible({ timeout: 10000 });
-    await expect(
-      alertModal.locator('[data-testid="modal-title"]'),
-    ).toContainText("Your account is too new");
     await expect(
       dialog.locator('[data-testid="new-group-back-button"]'),
     ).toHaveCount(0);
diff --git a/tests/e2e/specs/flows/createPost.test.js b/tests/e2e/specs/flows/createPost.test.js
index 2f33ce7e..7f8cce2b 100644
--- a/tests/e2e/specs/flows/createPost.test.js
+++ b/tests/e2e/specs/flows/createPost.test.js
@@ -142,7 +142,9 @@ test.describe("Create post flow", () => {
     // Verify the image embed rendered with alt text
     const postImages = profileView.locator('[data-testid="post-images"]');
     await expect(postImages).toBeVisible();
-    await expect(postImages.locator(".alt-indicator")).toContainText("ALT");
+    await expect(
+      postImages.locator('[data-testid="image-alt-badge"]'),
+    ).toBeVisible();
     await expect(postImages.locator("img.post-image")).toHaveAttribute(
       "alt",
       "A beautiful sunset over the mountains",
diff --git a/tests/e2e/specs/flows/createStarterPack.test.js b/tests/e2e/specs/flows/createStarterPack.test.js
index d686ed06..c9379141 100644
--- a/tests/e2e/specs/flows/createStarterPack.test.js
+++ b/tests/e2e/specs/flows/createStarterPack.test.js
@@ -92,7 +92,7 @@ test.describe("Profile → create starter pack flow", () => {
     );
     await expect(feedToggle).toHaveCount(1, { timeout: 10000 });
     await feedToggle.click();
-    await expect(nextButton).toHaveText("Finish");
+    await expect(nextButton).toHaveAttribute("data-teststate", "finish");
     await nextButton.click();
 
     await expect(page).toHaveURL(
diff --git a/tests/e2e/specs/flows/deletePost.test.js b/tests/e2e/specs/flows/deletePost.test.js
index a27e04bf..0cc68b15 100644
--- a/tests/e2e/specs/flows/deletePost.test.js
+++ b/tests/e2e/specs/flows/deletePost.test.js
@@ -139,7 +139,11 @@ test.describe("Delete post flow", () => {
       1,
       { timeout: 10000 },
     );
-    await expect(notificationsView).toContainText("liked your post");
+    await expect(
+      notificationsView.locator(
+        '[data-testid="notification-item"][data-teststate="like"]',
+      ),
+    ).toBeVisible();
 
     // Delete the post from the profile view
     await page.goto(`/profile/${userProfile.did}`);
@@ -155,10 +159,9 @@ test.describe("Delete post flow", () => {
 
     // Notification should now be hidden because the post is a notFoundPost
     await page.goto("/notifications");
-    await expect(notificationsView.locator(".feed-end-message")).toContainText(
-      "No notifications yet!",
-      { timeout: 10000 },
-    );
+    await expect(
+      notificationsView.locator('[data-testid="empty-state"]'),
+    ).toBeVisible({ timeout: 10000 });
     await expect(notificationsView.locator(".notification-item")).toHaveCount(
       0,
     );
diff --git a/tests/e2e/specs/flows/editProfile.test.js b/tests/e2e/specs/flows/editProfile.test.js
index 822302a3..01bf39f7 100644
--- a/tests/e2e/specs/flows/editProfile.test.js
+++ b/tests/e2e/specs/flows/editProfile.test.js
@@ -508,9 +508,8 @@ test.describe("Edit profile flow", () => {
     await dialog.locator('[data-testid="edit-profile-save-button"]').click();
 
     // Error message should appear in the dialog
-    await expect(dialog.locator(".form-dialog-error")).toContainText(
-      "Failed to save profile",
-      { timeout: 5000 },
-    );
+    await expect(
+      dialog.locator('[data-testid="form-dialog-error"]'),
+    ).toBeVisible({ timeout: 5000 });
   });
 });
diff --git a/tests/e2e/specs/flows/editStarterPack.test.js b/tests/e2e/specs/flows/editStarterPack.test.js
index 731e5c3d..7e410b6d 100644
--- a/tests/e2e/specs/flows/editStarterPack.test.js
+++ b/tests/e2e/specs/flows/editStarterPack.test.js
@@ -94,7 +94,7 @@ test.describe("Starter pack edit flow", () => {
     );
     await nextButton.click();
     await expect(wizard).toHaveAttribute("data-teststate", "feeds");
-    await expect(nextButton).toHaveText("Skip");
+    await expect(nextButton).toHaveAttribute("data-teststate", "skip");
     await nextButton.click();
 
     await expect(wizard).toHaveCount(0, { timeout: 10000 });
diff --git a/tests/e2e/specs/flows/editThreadgate.test.js b/tests/e2e/specs/flows/editThreadgate.test.js
index 7e3193f4..af7c1b56 100644
--- a/tests/e2e/specs/flows/editThreadgate.test.js
+++ b/tests/e2e/specs/flows/editThreadgate.test.js
@@ -42,7 +42,7 @@ test.describe("Edit threadgate flow", () => {
     const largePost = page.locator('[data-testid="large-post"]');
     await expect(largePost).toBeVisible({ timeout: 10000 });
     const badge = page.locator('[data-testid="who-can-reply-badge"]');
-    await expect(badge).toHaveText("Everybody can reply");
+    await expect(badge).toHaveAttribute("data-teststate", "everybody");
 
     await largePost.locator('[data-testid="post-action-more"]').click();
     await page
@@ -63,7 +63,7 @@ test.describe("Edit threadgate flow", () => {
     await dialog.locator('[data-testid="interaction-settings-save"]').click();
 
     await expect(dialog).not.toBeVisible({ timeout: 5000 });
-    await expect(badge).toHaveText("Replies disabled");
+    await expect(badge).toHaveAttribute("data-teststate", "nobody");
 
     expect(mockServer.putThreadgateCalls.length).toBe(1);
     const body = mockServer.putThreadgateCalls[0];
@@ -106,8 +106,10 @@ test.describe("Edit threadgate flow", () => {
     await page.goto(`/profile/${userProfile.handle}/post/own1`);
 
     const badge = page.locator('[data-testid="who-can-reply-badge"]');
-    await expect(badge).toHaveText("Replies disabled", { timeout: 10000 });
-    await expect(badge).toHaveAttribute("data-teststate", "link");
+    await expect(badge).toHaveAttribute("data-teststate", "nobody", {
+      timeout: 10000,
+    });
+    await expect(badge).toHaveClass(/who-can-reply-badge-link/);
 
     await badge.click();
     const dialog = page.locator(
@@ -124,7 +126,7 @@ test.describe("Edit threadgate flow", () => {
     await dialog.locator('[data-testid="interaction-settings-save"]').click();
 
     await expect(dialog).not.toBeVisible({ timeout: 5000 });
-    await expect(badge).toHaveText("Everybody can reply");
+    await expect(badge).toHaveAttribute("data-teststate", "everybody");
 
     expect(mockServer.putThreadgateCalls.length).toBe(1);
     const body = mockServer.putThreadgateCalls[0];
@@ -199,7 +201,7 @@ test.describe("Edit threadgate flow", () => {
     await expect(largePost).toBeVisible({ timeout: 10000 });
 
     const badge = page.locator('[data-testid="who-can-reply-badge"]');
-    await expect(badge).toHaveAttribute("data-teststate", "plain");
+    await expect(badge).not.toHaveClass(/who-can-reply-badge-link/);
     await badge.click();
     await expect(
       page.locator('[data-testid="who-can-reply-modal"]'),
diff --git a/tests/e2e/specs/flows/goLive.test.js b/tests/e2e/specs/flows/goLive.test.js
index cec2938b..d9e74996 100644
--- a/tests/e2e/specs/flows/goLive.test.js
+++ b/tests/e2e/specs/flows/goLive.test.js
@@ -37,7 +37,6 @@ test.describe("Go Live flow", () => {
       '[data-testid="menu-action-profile-go-live"]',
     );
     await expect(goLiveItem).toHaveAttribute("data-teststate", "off");
-    await expect(goLiveItem).toContainText("Go live");
     await goLiveItem.click();
 
     // 2. Dialog opens; type URL; preview lands after debounce.
@@ -66,7 +65,6 @@ test.describe("Go Live flow", () => {
     menu = await openProfileMenu(page);
     goLiveItem = menu.locator('[data-testid="menu-action-profile-go-live"]');
     await expect(goLiveItem).toHaveAttribute("data-teststate", "live");
-    await expect(goLiveItem).toContainText("Edit live status");
     await goLiveItem.click();
 
     // 5. Edit dialog opens with URL prefilled; change URL and Save.
diff --git a/tests/e2e/specs/flows/hidePost.test.js b/tests/e2e/specs/flows/hidePost.test.js
index fc88a5a0..e8bfefd1 100644
--- a/tests/e2e/specs/flows/hidePost.test.js
+++ b/tests/e2e/specs/flows/hidePost.test.js
@@ -114,7 +114,7 @@ test.describe("Hide post flow", () => {
     // The reply should show a "Post hidden by you" moderation warning
     const warning = view.locator("moderation-warning");
     await expect(warning).toBeVisible({ timeout: 10000 });
-    await expect(warning).toContainText("Post hidden by you");
+    await expect(warning).toHaveAttribute("data-teststate", "hidden");
 
     // Expanding the warning should reveal the content
     await warning.locator(".top-bar").click();
diff --git a/tests/e2e/specs/flows/installRemotePlugin.test.js b/tests/e2e/specs/flows/installRemotePlugin.test.js
index 4baa97eb..00b138f5 100644
--- a/tests/e2e/specs/flows/installRemotePlugin.test.js
+++ b/tests/e2e/specs/flows/installRemotePlugin.test.js
@@ -33,7 +33,11 @@ test.describe("Remote plugin install flow", () => {
     const installButton = listing.locator(
       '[data-testid="plugin-listing-install-button"]',
     );
-    await expect(installButton).toHaveText("Install", { timeout: 10000 });
+    await expect(installButton).toHaveAttribute(
+      "data-teststate",
+      "not-installed",
+      { timeout: 10000 },
+    );
     const putPrefs = page.waitForResponse((res) =>
       res.url().includes("app.bsky.actor.putPreferences"),
     );
diff --git a/tests/e2e/specs/flows/joinLinkEmbed.test.js b/tests/e2e/specs/flows/joinLinkEmbed.test.js
index 8b13df11..392cc0cb 100644
--- a/tests/e2e/specs/flows/joinLinkEmbed.test.js
+++ b/tests/e2e/specs/flows/joinLinkEmbed.test.js
@@ -165,8 +165,9 @@ test.describe("Join link embed flows", () => {
       ).toHaveAttribute("data-teststate", "copy", { timeout: 10000 });
       await page.locator('[data-testid="join-link-embed-action"]').click();
 
-      await expect(page.locator('[data-testid="toast"]')).toContainText(
-        "Copied to clipboard",
+      await expect(page.locator('[data-testid="toast"]')).toHaveAttribute(
+        "data-teststate",
+        "success",
       );
 
       if (browserName === "chromium") {
@@ -255,9 +256,7 @@ test.describe("Join link embed flows", () => {
       });
       await action.click();
 
-      await expect(page.locator('[data-testid="modal-title"]')).toContainText(
-        "Request pending",
-      );
+      await expect(page.locator('[data-testid="alert-modal"]')).toBeVisible();
     });
   });
 
@@ -335,8 +334,9 @@ test.describe("Join link embed flows", () => {
 
       await page.locator('[data-testid="modal-confirm-button"]').click();
 
-      await expect(page.locator('[data-testid="toast"]')).toContainText(
-        "Could not send join request",
+      await expect(page.locator('[data-testid="toast"]')).toHaveAttribute(
+        "data-teststate",
+        "error",
       );
       await expect(
         page.locator('[data-testid="modal-confirm-button"]'),
diff --git a/tests/e2e/specs/flows/leaveGroupChat.test.js b/tests/e2e/specs/flows/leaveGroupChat.test.js
index e2fd49b7..5fbc2f44 100644
--- a/tests/e2e/specs/flows/leaveGroupChat.test.js
+++ b/tests/e2e/specs/flows/leaveGroupChat.test.js
@@ -35,9 +35,7 @@ test.describe("Leave group chat from settings", () => {
     await confirmModal.locator('[data-testid="modal-confirm-button"]').click();
 
     await expect(page).toHaveURL(/\/messages$/, { timeout: 10000 });
-    await expect(page.locator('[data-testid="toast"]')).toContainText(
-      "Left group chat",
-    );
+    await expect(page.locator('[data-testid="toast"]')).toBeVisible();
 
     const chatView = page.locator("#chat-view");
     await expect(chatView.locator(".convo-item")).toHaveCount(0, {
diff --git a/tests/e2e/specs/flows/muteConversation.test.js b/tests/e2e/specs/flows/muteConversation.test.js
index 46c59d8c..dfbf32a4 100644
--- a/tests/e2e/specs/flows/muteConversation.test.js
+++ b/tests/e2e/specs/flows/muteConversation.test.js
@@ -32,10 +32,9 @@ test.describe("Mute conversation flow", () => {
 
     await toggle.click();
 
-    await expect(page.locator('[data-testid="toast"]')).toContainText(
-      "Group chat muted",
-      { timeout: 10000 },
-    );
+    await expect(page.locator('[data-testid="toast"]')).toBeVisible({
+      timeout: 10000,
+    });
     await expect(toggle).toHaveAttribute("data-teststate", "muted");
 
     await page.goto("/messages");
@@ -76,10 +75,9 @@ test.describe("Mute conversation flow", () => {
 
     await toggle.click();
 
-    await expect(page.locator('[data-testid="toast"]')).toContainText(
-      "Group chat unmuted",
-      { timeout: 10000 },
-    );
+    await expect(page.locator('[data-testid="toast"]')).toBeVisible({
+      timeout: 10000,
+    });
     await expect(toggle).toHaveAttribute("data-teststate", "unmuted");
   });
 });
diff --git a/tests/e2e/specs/flows/newChatFromChatList.test.js b/tests/e2e/specs/flows/newChatFromChatList.test.js
index 74f0cdf7..23490dbf 100644
--- a/tests/e2e/specs/flows/newChatFromChatList.test.js
+++ b/tests/e2e/specs/flows/newChatFromChatList.test.js
@@ -68,10 +68,9 @@ test.describe("New chat from chat list flow", () => {
     await login(page);
     await page.goto("/messages");
     const chatView = page.locator("#chat-view");
-    await expect(chatView.locator(".feed-end-message")).toContainText(
-      "No conversations yet!",
-      { timeout: 10000 },
-    );
+    await expect(chatView.locator('[data-testid="empty-state"]')).toBeVisible({
+      timeout: 10000,
+    });
     await expect(chatView.locator(".convo-item")).toHaveCount(0);
 
     await chatView.locator('[data-testid="new-chat-button"]').click();
@@ -149,7 +148,7 @@ test.describe("New chat from chat list flow", () => {
     await expect(results.nth(1)).toBeDisabled();
     await expect(
       results.nth(1).locator('[data-testid="not-messageable-hint"]'),
-    ).toContainText("Can't be messaged");
+    ).toBeVisible();
   });
 
   test("should show an error toast and stay on the chat list when the server rejects the chat", async ({
diff --git a/tests/e2e/specs/flows/pinFeed.test.js b/tests/e2e/specs/flows/pinFeed.test.js
index 1e2acd41..4fe62b27 100644
--- a/tests/e2e/specs/flows/pinFeed.test.js
+++ b/tests/e2e/specs/flows/pinFeed.test.js
@@ -56,9 +56,11 @@ test.describe("Pin feed flow", () => {
     await expect(homeView.locator(".tab-bar-button")).toHaveCount(1, {
       timeout: 10000,
     });
-    await expect(homeView.locator(".tab-bar-button.active")).toContainText(
-      "Following",
-    );
+    await expect(
+      homeView.locator(
+        '[data-testid="tab-following"][data-teststate="active"]',
+      ),
+    ).toBeVisible();
   });
 
   test("should show feed in feeds index after pinning from feed detail", async ({
@@ -82,7 +84,9 @@ test.describe("Pin feed flow", () => {
     await expect(feedsView.locator(".feeds-list-item")).toHaveCount(1, {
       timeout: 10000,
     });
-    await expect(feedsView).toContainText("Following");
+    await expect(
+      feedsView.locator('[data-testid="feeds-list-item-following"]'),
+    ).toBeVisible();
 
     // Navigate to the feed detail page and pin it
     await page.goto("/profile/creator1.bsky.social/feed/trending");
@@ -100,7 +104,9 @@ test.describe("Pin feed flow", () => {
     await expect(feedsView.locator(".feeds-list-item")).toHaveCount(2, {
       timeout: 10000,
     });
-    await expect(feedsView).toContainText("Following");
+    await expect(
+      feedsView.locator('[data-testid="feeds-list-item-following"]'),
+    ).toBeVisible();
     await expect(feedsView).toContainText("Trending");
     await expect(feedsView).toContainText("by @creator1.bsky.social");
 
@@ -109,7 +115,7 @@ test.describe("Pin feed flow", () => {
     const homeView = page.locator("#home-view");
     const tabs = homeView.locator(".tab-bar-button");
     await expect(tabs).toHaveCount(2, { timeout: 10000 });
-    await expect(tabs.nth(0)).toContainText("Following");
+    await expect(tabs.nth(0)).toHaveAttribute("data-testid", "tab-following");
     await expect(tabs.nth(1)).toContainText("Trending");
   });
 
@@ -155,7 +161,7 @@ test.describe("Pin feed flow", () => {
     const homeView = page.locator("#home-view");
     const tabs = homeView.locator(".tab-bar-button");
     await expect(tabs).toHaveCount(2, { timeout: 10000 });
-    await expect(tabs.nth(0)).toContainText("Following");
+    await expect(tabs.nth(0)).toHaveAttribute("data-testid", "tab-following");
     await expect(tabs.nth(1)).toContainText("Trending");
   });
 
@@ -192,7 +198,9 @@ test.describe("Pin feed flow", () => {
     await expect(feedsView.locator(".feeds-list-item")).toHaveCount(1, {
       timeout: 10000,
     });
-    await expect(feedsView).toContainText("Following");
+    await expect(
+      feedsView.locator('[data-testid="feeds-list-item-following"]'),
+    ).toBeVisible();
     await expect(feedsView).not.toContainText("Trending");
 
     // Navigate to home — unpinned feed should not appear as a tab
@@ -200,7 +208,7 @@ test.describe("Pin feed flow", () => {
     const homeView = page.locator("#home-view");
     const tabs = homeView.locator(".tab-bar-button");
     await expect(tabs).toHaveCount(1, { timeout: 10000 });
-    await expect(tabs.nth(0)).toContainText("Following");
+    await expect(tabs.nth(0)).toHaveAttribute("data-testid", "tab-following");
   });
 
   test("should remove feed from feeds index after unpinning from feed detail", async ({
@@ -240,7 +248,9 @@ test.describe("Pin feed flow", () => {
     await expect(feedsView.locator(".feeds-list-item")).toHaveCount(1, {
       timeout: 10000,
     });
-    await expect(feedsView).toContainText("Following");
+    await expect(
+      feedsView.locator('[data-testid="feeds-list-item-following"]'),
+    ).toBeVisible();
     await expect(feedsView).not.toContainText("Trending");
 
     // Navigate to home — unpinned feed should not appear as a tab
@@ -248,6 +258,6 @@ test.describe("Pin feed flow", () => {
     const homeView = page.locator("#home-view");
     const tabs = homeView.locator(".tab-bar-button");
     await expect(tabs).toHaveCount(1, { timeout: 10000 });
-    await expect(tabs.nth(0)).toContainText("Following");
+    await expect(tabs.nth(0)).toHaveAttribute("data-testid", "tab-following");
   });
 });
diff --git a/tests/e2e/specs/flows/quotePost.test.js b/tests/e2e/specs/flows/quotePost.test.js
index 5c4b6e89..337a4db6 100644
--- a/tests/e2e/specs/flows/quotePost.test.js
+++ b/tests/e2e/specs/flows/quotePost.test.js
@@ -99,7 +99,7 @@ test.describe("Quote post flow", () => {
     const quotesView = page.locator("#post-quotes-view");
     await expect(
       quotesView.locator('[data-testid="header-title"]'),
-    ).toContainText("Quotes", { timeout: 10000 });
+    ).toBeVisible({ timeout: 10000 });
 
     await expect(quotesView.locator('[data-testid="small-post"]')).toHaveCount(
       1,
diff --git a/tests/e2e/specs/views/bookmarks.view.test.js b/tests/e2e/specs/views/bookmarks.view.test.js
index 75679b0c..5df2c11e 100644
--- a/tests/e2e/specs/views/bookmarks.view.test.js
+++ b/tests/e2e/specs/views/bookmarks.view.test.js
@@ -29,7 +29,7 @@ test.describe("Bookmarks view", () => {
     const bookmarksView = page.locator("#bookmarks-view");
     await expect(
       bookmarksView.locator('[data-testid="header-title"]'),
-    ).toContainText("Saved Posts", { timeout: 10000 });
+    ).toBeVisible({ timeout: 10000 });
 
     await expect(
       bookmarksView.locator('[data-testid="feed-item"]'),
@@ -65,7 +65,7 @@ test.describe("Bookmarks view", () => {
 
     await expect(
       bookmarksView.locator('[data-testid="empty-state"]'),
-    ).toContainText("No saved posts yet!", { timeout: 10000 });
+    ).toBeVisible({ timeout: 10000 });
   });
 
   test("should display empty state when there are no bookmarks", async ({
@@ -80,11 +80,11 @@ test.describe("Bookmarks view", () => {
     const bookmarksView = page.locator("#bookmarks-view");
     await expect(
       bookmarksView.locator('[data-testid="header-title"]'),
-    ).toContainText("Saved Posts", { timeout: 10000 });
+    ).toBeVisible({ timeout: 10000 });
 
     await expect(
       bookmarksView.locator('[data-testid="empty-state"]'),
-    ).toContainText("No saved posts yet!", { timeout: 10000 });
+    ).toBeVisible({ timeout: 10000 });
   });
 
   test.describe("Logged-out behavior", () => {
diff --git a/tests/e2e/specs/views/chat.view.test.js b/tests/e2e/specs/views/chat.view.test.js
index 9656a4d6..2b65181f 100644
--- a/tests/e2e/specs/views/chat.view.test.js
+++ b/tests/e2e/specs/views/chat.view.test.js
@@ -38,9 +38,9 @@ test.describe("Chat view", () => {
     await page.goto("/messages");
 
     const chatView = page.locator("#chat-view");
-    await expect(
-      chatView.locator('[data-testid="header-title"]'),
-    ).toContainText("Chats", { timeout: 10000 });
+    await expect(chatView.locator('[data-testid="header-title"]')).toBeVisible({
+      timeout: 10000,
+    });
 
     await expect(chatView.locator(".convo-item")).toHaveCount(1, {
       timeout: 10000,
@@ -157,7 +157,7 @@ test.describe("Chat view", () => {
     const requestsView = page.locator("#chat-requests-view");
     await expect(
       requestsView.locator('[data-testid="header-title"]'),
-    ).toContainText("Chat requests", { timeout: 10000 });
+    ).toBeVisible({ timeout: 10000 });
   });
 
   test("should show an unread dot on the inbox button when unread requests exist", async ({
@@ -223,10 +223,9 @@ test.describe("Chat view", () => {
     await page.goto("/messages");
 
     const chatView = page.locator("#chat-view");
-    await expect(chatView.locator(".feed-end-message")).toContainText(
-      "No conversations yet!",
-      { timeout: 10000 },
-    );
+    await expect(chatView.locator('[data-testid="empty-state"]')).toBeVisible({
+      timeout: 10000,
+    });
     await expect(chatView.locator(".convo-item")).toHaveCount(0);
   });
 
@@ -428,9 +427,10 @@ test.describe("Chat view", () => {
 
       // The invite is still a request, so the main list stays empty
       const chatView = page.locator("#chat-view");
-      await expect(chatView.locator(".feed-end-message")).toContainText(
-        "No conversations yet!",
-        { timeout: 10000 },
+      await expect(chatView.locator('[data-testid="empty-state"]')).toBeVisible(
+        {
+          timeout: 10000,
+        },
       );
     });
   });
@@ -445,13 +445,12 @@ test.describe("Chat view", () => {
     await page.goto("/messages");
 
     const chatView = page.locator("#chat-view");
-    await expect(
-      chatView.locator('[data-testid="header-title"]'),
-    ).toContainText("Chats", { timeout: 10000 });
-    await expect(chatView.locator(".feed-end-message")).toContainText(
-      "No conversations yet!",
-      { timeout: 10000 },
-    );
+    await expect(chatView.locator('[data-testid="header-title"]')).toBeVisible({
+      timeout: 10000,
+    });
+    await expect(chatView.locator('[data-testid="empty-state"]')).toBeVisible({
+      timeout: 10000,
+    });
     await expect(chatView.locator(".convo-item")).toHaveCount(0);
   });
 
@@ -474,9 +473,7 @@ test.describe("Chat view", () => {
     await expect(
       dialog.locator('[data-testid="new-chat-search-input"]'),
     ).toBeVisible();
-    await expect(dialog.locator('[data-testid="empty-state"]')).toContainText(
-      "Search for someone to message",
-    );
+    await expect(dialog.locator('[data-testid="empty-state"]')).toBeVisible();
 
     await dialog.locator('[data-testid="new-chat-dialog-close"]').click();
     await expect(dialog).not.toBeVisible();
@@ -513,9 +510,9 @@ test.describe("Chat view", () => {
     await page.goto("/messages");
 
     const chatView = page.locator("#chat-view");
-    await expect(
-      chatView.locator('[data-testid="header-title"]'),
-    ).toContainText("Chats", { timeout: 10000 });
+    await expect(chatView.locator('[data-testid="header-title"]')).toBeVisible({
+      timeout: 10000,
+    });
     await expect(
       chatView.locator('[data-testid="new-chat-button"]'),
     ).toBeHidden();
@@ -583,10 +580,9 @@ test.describe("Chat view", () => {
     await page.goto("/messages");
 
     const chatView = page.locator("#chat-view");
-    await expect(chatView.locator(".error-state")).toContainText(
-      "There was an error loading conversations.",
-      { timeout: 10000 },
-    );
+    await expect(
+      chatView.locator('[data-testid="convo-list-error"]'),
+    ).toBeVisible({ timeout: 10000 });
   });
 
   test.describe("Live status", () => {
diff --git a/tests/e2e/specs/views/chatDetail.view.test.js b/tests/e2e/specs/views/chatDetail.view.test.js
index 7daabaa8..aee52caa 100644
--- a/tests/e2e/specs/views/chatDetail.view.test.js
+++ b/tests/e2e/specs/views/chatDetail.view.test.js
@@ -877,7 +877,7 @@ test.describe("Chat detail view", () => {
 
     await expect(
       page.locator('#chat-view [data-testid="header-title"]'),
-    ).toContainText("Chats", { timeout: 10000 });
+    ).toBeVisible({ timeout: 10000 });
   });
 
   test("should open bsky.app link from chat menu", async ({ page }) => {
@@ -1025,7 +1025,6 @@ test.describe("Chat detail view", () => {
     const muteItem = chatDetailView.locator('[data-testid="menu-action-mute"]');
     await expect(muteItem).toBeVisible();
     await expect(muteItem).toHaveAttribute("data-teststate", "unmuted");
-    await expect(muteItem).toContainText("Mute conversation");
     await expect(
       chatDetailView.locator('[data-testid="menu-action-leave"]'),
     ).toBeVisible();
@@ -1115,9 +1114,7 @@ test.describe("Chat detail view", () => {
     await chatDetailView.locator('[data-testid="chat-menu-button"]').click();
     await chatDetailView.locator('[data-testid="menu-action-mute"]').click();
 
-    await expect(page.locator('[data-testid="toast"]')).toContainText(
-      "Conversation muted",
-    );
+    await expect(page.locator('[data-testid="toast"]')).toBeVisible();
     await expect(
       chatDetailView.locator('[data-testid="header-muted-icon"]'),
     ).toBeVisible();
@@ -1125,7 +1122,6 @@ test.describe("Chat detail view", () => {
     await chatDetailView.locator('[data-testid="chat-menu-button"]').click();
     const muteItem = chatDetailView.locator('[data-testid="menu-action-mute"]');
     await expect(muteItem).toHaveAttribute("data-teststate", "muted");
-    await expect(muteItem).toContainText("Unmute conversation");
   });
 
   test("should unmute a 1-1 conversation from the chat menu", async ({
@@ -1155,9 +1151,7 @@ test.describe("Chat detail view", () => {
     await chatDetailView.locator('[data-testid="chat-menu-button"]').click();
     await chatDetailView.locator('[data-testid="menu-action-mute"]').click();
 
-    await expect(page.locator('[data-testid="toast"]')).toContainText(
-      "Conversation unmuted",
-    );
+    await expect(page.locator('[data-testid="toast"]')).toBeVisible();
     await expect(
       chatDetailView.locator('[data-testid="header-muted-icon"]'),
     ).toHaveCount(0);
@@ -1189,9 +1183,7 @@ test.describe("Chat detail view", () => {
     await page.locator('[data-testid="modal-confirm-button"]').click();
 
     await expect(page).toHaveURL(/\/messages$/, { timeout: 10000 });
-    await expect(page.locator('[data-testid="toast"]')).toContainText(
-      "Left conversation",
-    );
+    await expect(page.locator('[data-testid="toast"]')).toBeVisible();
   });
 
   test("should keep the leave modal open when leaveConvo fails", async ({
diff --git a/tests/e2e/specs/views/chatRequests.view.test.js b/tests/e2e/specs/views/chatRequests.view.test.js
index ad1aebaa..ca439ff9 100644
--- a/tests/e2e/specs/views/chatRequests.view.test.js
+++ b/tests/e2e/specs/views/chatRequests.view.test.js
@@ -267,7 +267,7 @@ test.describe("Chat requests view", () => {
     const requestsView = page.locator("#chat-requests-view");
     await expect(
       requestsView.locator('[data-testid="header-title"]'),
-    ).toContainText("Chat requests", { timeout: 10000 });
+    ).toBeVisible({ timeout: 10000 });
 
     await expect(requestsView.locator(".chat-request-item")).toHaveCount(1, {
       timeout: 10000,
@@ -285,11 +285,11 @@ test.describe("Chat requests view", () => {
 
     // Should show accept and reject buttons
     await expect(
-      requestsView.locator(".chat-request-button.accept"),
-    ).toContainText("Accept");
+      requestsView.locator('[data-testid="chat-request-accept-button"]'),
+    ).toBeVisible();
     await expect(
-      requestsView.locator(".chat-request-button.reject"),
-    ).toContainText("Reject");
+      requestsView.locator('[data-testid="chat-request-reject-button"]'),
+    ).toBeVisible();
   });
 
   test("should accept a chat request and navigate to the conversation", async ({
@@ -492,13 +492,13 @@ test.describe("Chat requests view", () => {
     const requestsView = page.locator("#chat-requests-view");
     await expect(
       requestsView.locator('[data-testid="header-title"]'),
-    ).toContainText("Chat requests", { timeout: 10000 });
+    ).toBeVisible({ timeout: 10000 });
 
     await requestsView.locator('[data-testid="back-button"]').click();
 
     await expect(
       page.locator('#chat-view [data-testid="header-title"]'),
-    ).toContainText("Chats", { timeout: 10000 });
+    ).toBeVisible({ timeout: 10000 });
   });
 
   test("should show empty state when there are no chat requests", async ({
@@ -513,7 +513,7 @@ test.describe("Chat requests view", () => {
     const requestsView = page.locator("#chat-requests-view");
     await expect(
       requestsView.locator('[data-testid="header-title"]'),
-    ).toContainText("Chat requests", { timeout: 10000 });
+    ).toBeVisible({ timeout: 10000 });
     await expect(
       requestsView.locator('[data-testid="empty-state"]'),
     ).toBeVisible({ timeout: 10000 });
@@ -538,10 +538,9 @@ test.describe("Chat requests view", () => {
     await page.goto("/messages/inbox");
 
     const requestsView = page.locator("#chat-requests-view");
-    await expect(requestsView.locator(".error-state")).toContainText(
-      "There was an error loading chat requests.",
-      { timeout: 10000 },
-    );
+    await expect(
+      requestsView.locator('[data-testid="chat-requests-error"]'),
+    ).toBeVisible({ timeout: 10000 });
   });
 
   test.describe("Logged-out behavior", () => {
diff --git a/tests/e2e/specs/views/communityPluginListing.view.test.js b/tests/e2e/specs/views/communityPluginListing.view.test.js
index f7aa2808..a0333a90 100644
--- a/tests/e2e/specs/views/communityPluginListing.view.test.js
+++ b/tests/e2e/specs/views/communityPluginListing.view.test.js
@@ -80,7 +80,9 @@ test.describe("Community plugin listing view", () => {
     const button = view.locator(
       '[data-testid="plugin-listing-install-button"]',
     );
-    await expect(button).toHaveText("Install", { timeout: 10000 });
+    await expect(button).toHaveAttribute("data-teststate", "not-installed", {
+      timeout: 10000,
+    });
 
     const putPrefs = page.waitForResponse((res) =>
       res.url().includes("app.bsky.actor.putPreferences"),
@@ -94,7 +96,9 @@ test.describe("Community plugin listing view", () => {
     await page.locator('[data-testid="modal-confirm-button"]').click();
     await putPrefs;
 
-    await expect(button).toHaveText("Uninstall", { timeout: 10000 });
+    await expect(button).toHaveAttribute("data-teststate", "installed", {
+      timeout: 10000,
+    });
     await expect(
       mockServer.installedPlugins.map((plugin) => plugin.id),
     ).toEqual([REMOTE_ID]);
@@ -114,7 +118,9 @@ test.describe("Community plugin listing view", () => {
     const button = view.locator(
       '[data-testid="plugin-listing-install-button"]',
     );
-    await expect(button).toHaveText("Uninstall", { timeout: 10000 });
+    await expect(button).toHaveAttribute("data-teststate", "installed", {
+      timeout: 10000,
+    });
 
     await button.click();
     const confirmButton = page.locator("button.confirm-button");
@@ -125,7 +131,9 @@ test.describe("Community plugin listing view", () => {
     await confirmButton.click();
     await putPrefs;
 
-    await expect(button).toHaveText("Install", { timeout: 10000 });
+    await expect(button).toHaveAttribute("data-teststate", "not-installed", {
+      timeout: 10000,
+    });
     await expect(mockServer.installedPlugins).toEqual([]);
   });
 
@@ -145,14 +153,16 @@ test.describe("Community plugin listing view", () => {
     const button = view.locator(
       '[data-testid="plugin-listing-install-button"]',
     );
-    await expect(button).toHaveText("Uninstall", { timeout: 10000 });
+    await expect(button).toHaveAttribute("data-teststate", "installed", {
+      timeout: 10000,
+    });
 
     await button.click();
     const cancelButton = page.locator("button.cancel-button");
     await expect(cancelButton).toBeVisible({ timeout: 5000 });
     await cancelButton.click();
 
-    await expect(button).toHaveText("Uninstall");
+    await expect(button).toHaveAttribute("data-teststate", "installed");
     await expect(
       mockServer.installedPlugins.map((plugin) => plugin.id),
     ).toEqual([REMOTE_ID]);
diff --git a/tests/e2e/specs/views/communityPlugins.view.test.js b/tests/e2e/specs/views/communityPlugins.view.test.js
index 0ffe6d09..2f249b69 100644
--- a/tests/e2e/specs/views/communityPlugins.view.test.js
+++ b/tests/e2e/specs/views/communityPlugins.view.test.js
@@ -20,10 +20,9 @@ test.describe("Community plugins view", () => {
 
     await page.goto("/plugins/community");
     const view = page.locator("#community-plugins-view");
-    await expect(view.locator('[data-testid="header-title"]')).toContainText(
-      "Community plugins",
-      { timeout: 10000 },
-    );
+    await expect(view.locator('[data-testid="header-title"]')).toBeVisible({
+      timeout: 10000,
+    });
 
     const items = view.locator(".plugin-list-item");
     await expect(items).toHaveCount(2);
@@ -234,6 +233,6 @@ test.describe("Community plugins view", () => {
     await expect(page).toHaveURL(/\/plugins\/community$/);
     await expect(
       page.locator('#community-plugins-view [data-testid="header-title"]'),
-    ).toContainText("Community plugins", { timeout: 10000 });
+    ).toBeVisible({ timeout: 10000 });
   });
 });
diff --git a/tests/e2e/specs/views/feeds.view.test.js b/tests/e2e/specs/views/feeds.view.test.js
index f9b6fcc9..e85f6c9c 100644
--- a/tests/e2e/specs/views/feeds.view.test.js
+++ b/tests/e2e/specs/views/feeds.view.test.js
@@ -24,19 +24,21 @@ test.describe("Feeds view", () => {
     await page.goto("/feeds");
 
     const feedsView = page.locator("#feeds-view");
-    await expect(
-      feedsView.locator('[data-testid="header-title"]'),
-    ).toContainText("Feeds", { timeout: 10000 });
-
-    await expect(feedsView.locator(".feeds-list-header")).toContainText(
-      "Pinned Feeds",
+    await expect(feedsView.locator('[data-testid="header-title"]')).toBeVisible(
+      { timeout: 10000 },
     );
 
+    await expect(
+      feedsView.locator('[data-testid="feeds-list-header"]'),
+    ).toBeVisible();
+
     await expect(feedsView.locator(".feeds-list-item")).toHaveCount(3, {
       timeout: 10000,
     });
 
-    await expect(feedsView).toContainText("Following");
+    await expect(
+      feedsView.locator('[data-testid="feeds-list-item-following"]'),
+    ).toBeVisible();
     await expect(feedsView).toContainText("Trending");
     await expect(feedsView).toContainText("by @creator1.bsky.social");
     await expect(feedsView).toContainText("Science");
@@ -120,15 +122,17 @@ test.describe("Feeds view", () => {
     await page.goto("/feeds");
 
     const feedsView = page.locator("#feeds-view");
-    await expect(
-      feedsView.locator('[data-testid="header-title"]'),
-    ).toContainText("Feeds", { timeout: 10000 });
+    await expect(feedsView.locator('[data-testid="header-title"]')).toBeVisible(
+      { timeout: 10000 },
+    );
 
     await expect(feedsView.locator(".feeds-list-item")).toHaveCount(1, {
       timeout: 10000,
     });
 
-    await expect(feedsView).toContainText("Following");
+    await expect(
+      feedsView.locator('[data-testid="feeds-list-item-following"]'),
+    ).toBeVisible();
   });
 
   test("should display pinned lists alongside pinned feeds", async ({
@@ -159,7 +163,9 @@ test.describe("Feeds view", () => {
       timeout: 10000,
     });
 
-    await expect(feedsView).toContainText("Following");
+    await expect(
+      feedsView.locator('[data-testid="feeds-list-item-following"]'),
+    ).toBeVisible();
     await expect(feedsView).toContainText("Trending");
     await expect(feedsView).toContainText("My Curated List");
     await expect(feedsView).toContainText("by @creator2.bsky.social");
@@ -283,10 +289,14 @@ test.describe("Feeds view", () => {
       await expect(
         feedsView.locator(".feeds-list-item").first(),
       ).toHaveAttribute("data-pinned-value", feedA.uri);
-      const titlesAfterDrag = await feedsView
-        .locator(".feeds-list-item-title")
-        .allTextContents();
-      expect(titlesAfterDrag).toEqual(["Feed A", "Feed B", "Following"]);
+      const pinnedValuesAfterDrag = await feedsView
+        .locator(".feeds-list-item")
+        .evaluateAll((items) => items.map((item) => item.dataset.pinnedValue));
+      expect(pinnedValuesAfterDrag).toEqual([
+        feedA.uri,
+        feedB.uri,
+        "following",
+      ]);
 
       const putRequest = page.waitForRequest(
         (req) =>
@@ -406,10 +416,14 @@ test.describe("Feeds view", () => {
         feedsView.locator('[data-testid="feeds-cancel-button"]'),
       ).toHaveCount(0);
 
-      const titlesAfterCancel = await feedsView
-        .locator(".feeds-list-item-title")
-        .allTextContents();
-      expect(titlesAfterCancel).toEqual(["Following", "Feed A", "Feed B"]);
+      const pinnedValuesAfterCancel = await feedsView
+        .locator(".feeds-list-item")
+        .evaluateAll((items) => items.map((item) => item.dataset.pinnedValue));
+      expect(pinnedValuesAfterCancel).toEqual([
+        "following",
+        feedA.uri,
+        feedB.uri,
+      ]);
       expect(sawPut).toBe(false);
     });
 
@@ -488,10 +502,10 @@ test.describe("Feeds view", () => {
 
       await expect(feedsView.locator(".feeds-list-item")).toHaveCount(2);
 
-      const titlesAfterUnpin = await feedsView
-        .locator(".feeds-list-item-title")
-        .allTextContents();
-      expect(titlesAfterUnpin).toEqual(["Following", "Feed B"]);
+      const pinnedValuesAfterUnpin = await feedsView
+        .locator(".feeds-list-item")
+        .evaluateAll((items) => items.map((item) => item.dataset.pinnedValue));
+      expect(pinnedValuesAfterUnpin).toEqual(["following", feedB.uri]);
       expect(sawPut).toBe(false);
     });
 
@@ -633,10 +647,14 @@ test.describe("Feeds view", () => {
       await expect(
         feedsView.locator('[data-testid="feeds-edit-button"]'),
       ).toBeVisible();
-      const titlesAfterCancel = await feedsView
-        .locator(".feeds-list-item-title")
-        .allTextContents();
-      expect(titlesAfterCancel).toEqual(["Following", "Feed A", "Feed B"]);
+      const pinnedValuesAfterCancel = await feedsView
+        .locator(".feeds-list-item")
+        .evaluateAll((items) => items.map((item) => item.dataset.pinnedValue));
+      expect(pinnedValuesAfterCancel).toEqual([
+        "following",
+        feedA.uri,
+        feedB.uri,
+      ]);
       expect(sawPut).toBe(false);
     });
 
@@ -742,10 +760,14 @@ test.describe("Feeds view", () => {
       await expect(feedsView.locator(".feeds-list-item")).toHaveCount(3, {
         timeout: 10000,
       });
-      const titlesAfterReturn = await feedsView
-        .locator(".feeds-list-item-title")
-        .allTextContents();
-      expect(titlesAfterReturn).toEqual(["Following", "Feed A", "Feed B"]);
+      const pinnedValuesAfterReturn = await feedsView
+        .locator(".feeds-list-item")
+        .evaluateAll((items) => items.map((item) => item.dataset.pinnedValue));
+      expect(pinnedValuesAfterReturn).toEqual([
+        "following",
+        feedA.uri,
+        feedB.uri,
+      ]);
       await expect(
         feedsView.locator('[data-testid="feeds-edit-button"]'),
       ).toBeVisible();
diff --git a/tests/e2e/specs/views/groupChatDetails.view.test.js b/tests/e2e/specs/views/groupChatDetails.view.test.js
index 9674bafe..b08ba8c7 100644
--- a/tests/e2e/specs/views/groupChatDetails.view.test.js
+++ b/tests/e2e/specs/views/groupChatDetails.view.test.js
@@ -109,7 +109,7 @@ test.describe("Group chat details view", () => {
     await expect(bobRow).toContainText("Bob");
     await expect(
       bobRow.locator('[data-testid="member-added-by"]'),
-    ).toContainText("Added by invite link");
+    ).toHaveAttribute("data-teststate", "invite-link");
     await expect(view.locator('[data-testid="admin-badge"]')).toHaveCount(1);
   });
 
@@ -262,7 +262,7 @@ test.describe("Group chat details view", () => {
     await expect(toggle).toHaveAttribute("data-teststate", "unmuted");
     await expect(
       view.locator('[data-testid="group-settings-leave-button"]'),
-    ).toContainText("Leave");
+    ).toBeVisible();
   });
 
   test("should reflect muted state on the group mute toggle", async ({
diff --git a/tests/e2e/specs/views/hashtag.view.test.js b/tests/e2e/specs/views/hashtag.view.test.js
index 39accb0c..e7fb7783 100644
--- a/tests/e2e/specs/views/hashtag.view.test.js
+++ b/tests/e2e/specs/views/hashtag.view.test.js
@@ -52,8 +52,8 @@ test.describe("Hashtag view", () => {
 
     const tabs = hashtagView.locator(".tab-bar-button");
     await expect(tabs).toHaveCount(2);
-    await expect(tabs.nth(0)).toContainText("Top");
-    await expect(tabs.nth(1)).toContainText("Latest");
+    await expect(tabs.nth(0)).toHaveAttribute("data-testid", "tab-top");
+    await expect(tabs.nth(1)).toHaveAttribute("data-testid", "tab-latest");
   });
 
   test("should have Top tab active by default", async ({ page }) => {
diff --git a/tests/e2e/specs/views/home.view.test.js b/tests/e2e/specs/views/home.view.test.js
index 8a9983c7..6512080d 100644
--- a/tests/e2e/specs/views/home.view.test.js
+++ b/tests/e2e/specs/views/home.view.test.js
@@ -32,11 +32,10 @@ test.describe("Home view", () => {
     await page.goto("/");
 
     const view = page.locator("#home-view");
-    await expect(view.locator(".tab-bar-button")).toContainText("Following", {
-      timeout: 10000,
-    });
-    await expect(view.locator(".tab-bar-button.active")).toContainText(
-      "Following",
+    await expect(view.locator('[data-testid="tab-following"]')).toHaveAttribute(
+      "data-teststate",
+      "active",
+      { timeout: 10000 },
     );
 
     await expect(view.locator('[data-testid="feed-item"]')).toHaveCount(2, {
@@ -132,7 +131,7 @@ test.describe("Home view", () => {
     const view = page.locator("#home-view");
     const tabs = view.locator(".tab-bar-button");
     await expect(tabs).toHaveCount(3, { timeout: 10000 });
-    await expect(tabs.nth(0)).toContainText("Following");
+    await expect(tabs.nth(0)).toHaveAttribute("data-testid", "tab-following");
     await expect(tabs.nth(1)).toContainText("Trending");
     await expect(tabs.nth(2)).toContainText("Science");
   });
@@ -162,7 +161,7 @@ test.describe("Home view", () => {
     const view = page.locator("#home-view");
     const tabs = view.locator(".tab-bar-button");
     await expect(tabs).toHaveCount(2, { timeout: 10000 });
-    await expect(tabs.nth(0)).toContainText("Following");
+    await expect(tabs.nth(0)).toHaveAttribute("data-testid", "tab-following");
     await expect(tabs.nth(1)).toContainText("My Curated List");
 
     await tabs.nth(1).click();
@@ -574,8 +573,9 @@ test.describe("Home view", () => {
     await page.goto("/");
 
     const view = page.locator("#home-view");
-    await expect(view.locator(".tab-bar-button.active")).toContainText(
-      "Following",
+    await expect(view.locator('[data-testid="tab-following"]')).toHaveAttribute(
+      "data-teststate",
+      "active",
       { timeout: 10000 },
     );
 
@@ -615,11 +615,8 @@ test.describe("Home view", () => {
     const view = page.locator("#home-view");
     await view.locator(".tab-bar-button", { hasText: "Broken Feed" }).click();
 
-    const errorState = view.locator(".error-state");
-    await expect(errorState).toContainText(
-      "An issue occurred when contacting the feed server.",
-      { timeout: 10000 },
-    );
+    const errorState = view.locator('[data-testid="feed-error"]');
+    await expect(errorState).toBeVisible({ timeout: 10000 });
     await expect(
       errorState.locator('[data-testid="feed-error-view-profile"]'),
     ).toHaveAttribute("href", "/profile/creator1.bsky.social");
@@ -643,16 +640,14 @@ test.describe("Home view", () => {
     await page.goto("/");
 
     const view = page.locator("#home-view");
-    await expect(view.locator(".tab-bar-button.active")).toContainText(
-      "Following",
+    await expect(view.locator('[data-testid="tab-following"]')).toHaveAttribute(
+      "data-teststate",
+      "active",
       { timeout: 10000 },
     );
 
-    const errorState = view.locator(".error-state");
-    await expect(errorState).toContainText(
-      "An issue occurred when contacting the feed server.",
-      { timeout: 10000 },
-    );
+    const errorState = view.locator('[data-testid="feed-error"]');
+    await expect(errorState).toBeVisible({ timeout: 10000 });
     await expect(errorState.locator("a")).toHaveCount(0);
   });
 
@@ -892,8 +887,6 @@ test.describe("Home view", () => {
 
       const modal = page.locator('[data-testid="sign-in-modal"]');
       await expect(modal).toBeVisible();
-      await expect(modal).toContainText("Sign in");
-      await expect(modal).toContainText("Sign in to join the conversation!");
       await expect(modal.locator("a")).toHaveAttribute("href", "/login");
     });
   });
@@ -1016,10 +1009,7 @@ test.describe("Home view", () => {
       await expect(warning).toBeVisible();
       await expect(warning).toContainText("Misleading");
       await expect(
-        warning.locator(".post-moderation-warning-description"),
-      ).toContainText("Labeled by");
-      await expect(
-        warning.locator(".post-moderation-warning-description"),
+        warning.locator('[data-testid="moderation-warning-description"]'),
       ).toContainText("@safety.example.com");
     });
 
@@ -1469,12 +1459,7 @@ test.describe("Home view", () => {
       await sendInteractionsRequest;
       await expect(
         visibleFeed.locator('[data-testid="feed-feedback-message"]'),
-      ).toContainText(
-        "Thank you for your feedback! It has been sent to the feed operator.",
-        {
-          timeout: 10000,
-        },
-      );
+      ).toBeVisible({ timeout: 10000 });
     });
 
     test("should send Show More interaction and show toast", async ({
diff --git a/tests/e2e/specs/views/installedPlugins.view.test.js b/tests/e2e/specs/views/installedPlugins.view.test.js
index 02cb84a7..97a89537 100644
--- a/tests/e2e/specs/views/installedPlugins.view.test.js
+++ b/tests/e2e/specs/views/installedPlugins.view.test.js
@@ -50,10 +50,9 @@ test.describe("Installed plugins view", () => {
     await page.goto("/plugins/installed");
 
     const view = page.locator("#installed-plugins-view");
-    await expect(view.locator('[data-testid="header-title"]')).toContainText(
-      "Plugins",
-      { timeout: 10000 },
-    );
+    await expect(view.locator('[data-testid="header-title"]')).toBeVisible({
+      timeout: 10000,
+    });
 
     const items = view.locator(".plugin-list-item");
     await expect(items.first()).toBeVisible({ timeout: 10000 });
@@ -142,9 +141,7 @@ test.describe("Installed plugins view", () => {
 
     const dialog = page.locator("dialog.confirm-modal");
     await expect(dialog).toBeVisible();
-    await expect(dialog.locator(".modal-dialog-title")).toContainText(
-      "Uninstall plugin?",
-    );
+    await expect(dialog.locator('[data-testid="modal-title"]')).toBeVisible();
     await dialog.locator(".confirm-button").click();
 
     await expect(page.locator('[data-testid="toast"]')).toBeVisible();
@@ -189,14 +186,16 @@ test.describe("Installed plugins view", () => {
     await page.goto("/plugins/installed");
 
     const view = page.locator("#installed-plugins-view");
-    const headerButton = view.locator(".plugin-check-updates-button");
-    await expect(headerButton).toContainText("Check for updates", {
+    const headerButton = view.locator(
+      '[data-testid="plugin-check-updates-button"]',
+    );
+    await expect(headerButton).toHaveAttribute("data-teststate", "check", {
       timeout: 10000,
     });
     await headerButton.click();
 
     await expect(page.locator('[data-testid="toast"]')).toBeVisible();
-    await expect(headerButton).toContainText("Check for updates");
+    await expect(headerButton).toHaveAttribute("data-teststate", "check");
     await expect(view.locator(".plugin-update-button")).toHaveCount(0);
   });
 
@@ -214,8 +213,10 @@ test.describe("Installed plugins view", () => {
     await page.goto("/plugins/installed");
 
     const view = page.locator("#installed-plugins-view");
-    const headerButton = view.locator(".plugin-check-updates-button");
-    await expect(headerButton).toContainText("Check for updates", {
+    const headerButton = view.locator(
+      '[data-testid="plugin-check-updates-button"]',
+    );
+    await expect(headerButton).toHaveAttribute("data-teststate", "check", {
       timeout: 10000,
     });
     await headerButton.click();
@@ -223,7 +224,7 @@ test.describe("Installed plugins view", () => {
     await expect(page.locator('[data-testid="toast"]')).toContainText(
       "1 update available",
     );
-    await expect(headerButton).toContainText("Update all");
+    await expect(headerButton).toHaveAttribute("data-teststate", "update-all");
 
     const sampleItem = view.locator(".plugin-list-item", {
       hasText: "Remote Themes",
@@ -236,7 +237,7 @@ test.describe("Installed plugins view", () => {
       "Updated Remote Themes to v1.0.1",
     );
     await expect(sampleItem.locator(".plugin-update-button")).toHaveCount(0);
-    await expect(headerButton).toContainText("Check for updates");
+    await expect(headerButton).toHaveAttribute("data-teststate", "check");
   });
 
   test("Update all updates every outdated plugin", async ({ page }) => {
@@ -251,12 +252,14 @@ test.describe("Installed plugins view", () => {
     await page.goto("/plugins/installed");
 
     const view = page.locator("#installed-plugins-view");
-    const headerButton = view.locator(".plugin-check-updates-button");
-    await expect(headerButton).toContainText("Check for updates", {
+    const headerButton = view.locator(
+      '[data-testid="plugin-check-updates-button"]',
+    );
+    await expect(headerButton).toHaveAttribute("data-teststate", "check", {
       timeout: 10000,
     });
     await headerButton.click();
-    await expect(headerButton).toContainText("Update all");
+    await expect(headerButton).toHaveAttribute("data-teststate", "update-all");
 
     await headerButton.click();
 
@@ -264,7 +267,7 @@ test.describe("Installed plugins view", () => {
       "Updated 1 plugin",
     );
     await expect(view.locator(".plugin-update-button")).toHaveCount(0);
-    await expect(headerButton).toContainText("Check for updates");
+    await expect(headerButton).toHaveAttribute("data-teststate", "check");
   });
 
   test("enabling a plugin via toggle navigates to settings link", async ({
@@ -383,7 +386,7 @@ test.describe("Installed plugins view", () => {
     await expect(page).toHaveURL(/\/plugins\/installed$/);
     await expect(
       page.locator('#installed-plugins-view [data-testid="header-title"]'),
-    ).toContainText("Plugins", { timeout: 10000 });
+    ).toBeVisible({ timeout: 10000 });
 
     await page.goto(`/settings/plugins/${TEST_PLUGIN_ID}`);
     await expect(page).toHaveURL(`/plugin/${TEST_PLUGIN_ID}/settings`);
diff --git a/tests/e2e/specs/views/listDetail.view.test.js b/tests/e2e/specs/views/listDetail.view.test.js
index 6317a16c..f9f8343e 100644
--- a/tests/e2e/specs/views/listDetail.view.test.js
+++ b/tests/e2e/specs/views/listDetail.view.test.js
@@ -498,7 +498,6 @@ test.describe("List Detail view", () => {
       const button = page.locator('[data-testid="subscribe-list-button"]');
       await expect(button).toBeVisible({ timeout: 10000 });
       await expect(button).toHaveAttribute("data-teststate", "not-subscribed");
-      await expect(button).toContainText("Subscribe");
     });
 
     test("should not show Subscribe button on curate lists", async ({
@@ -539,7 +538,6 @@ test.describe("List Detail view", () => {
       await expect(button).toHaveAttribute("data-teststate", "muted", {
         timeout: 10000,
       });
-      await expect(button).toContainText("Unmute list");
       await expect(page.locator('[data-testid="toast"]')).toBeVisible();
     });
 
@@ -563,7 +561,6 @@ test.describe("List Detail view", () => {
       await expect(button).toHaveAttribute("data-teststate", "blocked", {
         timeout: 10000,
       });
-      await expect(button).toContainText("Unblock list");
     });
 
     test("should unmute a moderation list when already muted", async ({
@@ -585,7 +582,6 @@ test.describe("List Detail view", () => {
       await expect(button).toHaveAttribute("data-teststate", "not-subscribed", {
         timeout: 10000,
       });
-      await expect(button).toContainText("Subscribe");
     });
 
     test("should unblock a moderation list when already blocked", async ({
diff --git a/tests/e2e/specs/views/lists.view.test.js b/tests/e2e/specs/views/lists.view.test.js
index 27cf800c..acde05ab 100644
--- a/tests/e2e/specs/views/lists.view.test.js
+++ b/tests/e2e/specs/views/lists.view.test.js
@@ -27,9 +27,9 @@ test.describe("Lists view", () => {
     await page.goto("/lists");
 
     const listsView = page.locator("#lists-view");
-    await expect(
-      listsView.locator('[data-testid="header-title"]'),
-    ).toContainText("Lists", { timeout: 10000 });
+    await expect(listsView.locator('[data-testid="header-title"]')).toBeVisible(
+      { timeout: 10000 },
+    );
 
     await expect(
       listsView.locator('[data-testid="feeds-list-item-list"]'),
@@ -49,10 +49,12 @@ test.describe("Lists view", () => {
     await page.goto("/lists");
 
     const listsView = page.locator("#lists-view");
-    await expect(
-      listsView.locator('[data-testid="header-title"]'),
-    ).toContainText("Lists", { timeout: 10000 });
-    await expect(listsView).toContainText("No lists.", { timeout: 10000 });
+    await expect(listsView.locator('[data-testid="header-title"]')).toBeVisible(
+      { timeout: 10000 },
+    );
+    await expect(listsView.locator('[data-testid="empty-state"]')).toBeVisible({
+      timeout: 10000,
+    });
   });
 
   test("should navigate to list detail when clicking a list", async ({
diff --git a/tests/e2e/specs/views/login.view.test.js b/tests/e2e/specs/views/login.view.test.js
index 8a89e3d3..18e1fd25 100644
--- a/tests/e2e/specs/views/login.view.test.js
+++ b/tests/e2e/specs/views/login.view.test.js
@@ -13,7 +13,7 @@ test.describe("Login view", () => {
 
     const loginView = page.locator("#login-view");
     await expect(
-      loginView.getByRole("heading", { name: "Sign in" }),
+      loginView.locator('[data-testid="login-title"]'),
     ).toBeVisible();
 
     const handleInput = page.locator('input[name="handle"]');
@@ -24,8 +24,12 @@ test.describe("Login view", () => {
     );
     await expect(handleInput).toBeFocused();
 
-    await expect(page.getByRole("button", { name: "Next" })).toBeVisible();
-    await expect(page.getByRole("button", { name: "Back" })).toBeVisible();
+    await expect(
+      page.locator('[data-testid="login-next-button"]'),
+    ).toBeVisible();
+    await expect(
+      page.locator('[data-testid="login-back-button"]'),
+    ).toBeVisible();
   });
 
   test("should show error for invalid username", async ({ page }) => {
@@ -35,7 +39,7 @@ test.describe("Login view", () => {
     await page.goto("/login");
 
     await page.locator('input[name="handle"]').fill("invalid.test");
-    await page.getByRole("button", { name: "Next" }).click();
+    await page.locator('[data-testid="login-next-button"]').click();
 
     await expect(page.locator(".error-message")).toBeVisible({
       timeout: 10000,
@@ -59,8 +63,8 @@ test.describe("Login view", () => {
     await advanced.locator("summary").click();
     await expect(select).toBeVisible();
     const options = select.locator("option");
-    await expect(options.first()).toHaveText("Bluesky");
-    await expect(options.last()).toHaveText("Custom");
+    await expect(options.first()).toHaveAttribute("value", "bluesky");
+    await expect(options.last()).toHaveAttribute("value", "custom");
     expect(await options.count()).toBeGreaterThanOrEqual(3);
   });
 
@@ -266,7 +270,7 @@ test.describe("Login view", () => {
       await page.locator('[data-testid="account-switcher-add"]').click();
       await expect(page.locator("#login-form")).toBeVisible();
 
-      await page.getByRole("button", { name: "Back" }).click();
+      await page.locator('[data-testid="login-back-button"]').click();
       await expect(
         page.locator('[data-testid="account-switcher-list"]'),
       ).toBeVisible();
diff --git a/tests/e2e/specs/views/notFound.view.test.js b/tests/e2e/specs/views/notFound.view.test.js
index e6fd65e1..6865d100 100644
--- a/tests/e2e/specs/views/notFound.view.test.js
+++ b/tests/e2e/specs/views/notFound.view.test.js
@@ -15,10 +15,10 @@ test.describe("Not Found view", () => {
       '[data-testid="view-column-center"] #not-found-view',
     );
     await expect(
-      notFoundView.getByRole("heading", { name: "Page not found" }),
+      notFoundView.locator('[data-testid="page-not-found"]'),
     ).toBeVisible();
     await expect(
-      notFoundView.getByRole("link", { name: "Go home" }),
+      notFoundView.locator('[data-testid="go-home-link"]'),
     ).toBeVisible();
   });
 
@@ -48,7 +48,7 @@ test.describe("Not Found view", () => {
 
     await page
       .locator("#not-found-view")
-      .getByRole("link", { name: "Go home" })
+      .locator('[data-testid="go-home-link"]')
       .click();
 
     await expect(page).toHaveURL("/");
diff --git a/tests/e2e/specs/views/notifications.view.test.js b/tests/e2e/specs/views/notifications.view.test.js
index 73dbe32e..6bb03bab 100644
--- a/tests/e2e/specs/views/notifications.view.test.js
+++ b/tests/e2e/specs/views/notifications.view.test.js
@@ -62,7 +62,7 @@ test.describe("Notifications view", () => {
     const item = view.locator(".notification-item");
     await expect(item).toHaveCount(1, { timeout: 10000 });
     await expect(item).toContainText("Alice");
-    await expect(item).toContainText("followed you");
+    await expect(item).toHaveAttribute("data-teststate", "follow");
   });
 
   test("should show a header loading spinner while notifications reload", async ({
@@ -201,7 +201,7 @@ test.describe("Notifications view", () => {
     const item = view.locator(".notification-item");
     await expect(item).toHaveCount(1, { timeout: 10000 });
     await expect(item).toContainText("Alice");
-    await expect(item).toContainText("liked your post");
+    await expect(item).toHaveAttribute("data-teststate", "like");
     await expect(view.locator(".notification-preview-text")).toContainText(
       "My awesome post",
     );
@@ -236,7 +236,7 @@ test.describe("Notifications view", () => {
     const item = view.locator(".notification-item");
     await expect(item).toHaveCount(1, { timeout: 10000 });
     await expect(item).toContainText("Bob");
-    await expect(item).toContainText("reposted your post");
+    await expect(item).toHaveAttribute("data-teststate", "repost");
     await expect(view.locator(".notification-preview-text")).toContainText(
       "Reposted content",
     );
@@ -283,7 +283,7 @@ test.describe("Notifications view", () => {
     await expect(item).toHaveCount(1, { timeout: 10000 });
     await expect(item).toContainText("Alice");
     await expect(item).toContainText("2 others");
-    await expect(item).toContainText("liked your post");
+    await expect(item).toHaveAttribute("data-teststate", "like");
     // Should show 3 avatars
     await expect(item.locator(".notification-avatar")).toHaveCount(3);
   });
@@ -312,7 +312,7 @@ test.describe("Notifications view", () => {
     await expect(item).toHaveCount(1, { timeout: 10000 });
     await expect(item).toContainText("Alice");
     await expect(item).toContainText("1 other");
-    await expect(item).toContainText("followed you");
+    await expect(item).toHaveAttribute("data-teststate", "follow");
     await expect(item.locator(".notification-avatar")).toHaveCount(2);
   });
 
@@ -474,9 +474,7 @@ test.describe("Notifications view", () => {
     ).toHaveCount(0);
   });
 
-  test("should display 'followed you back' for a follow-back notification", async ({
-    page,
-  }) => {
+  test("should display a follow-back notification", async ({ page }) => {
     const yourFollowRkey = createTid("2025-01-10T00:00:00.000Z");
     const followBackAuthor = createProfile({
       ...alice,
@@ -508,7 +506,7 @@ test.describe("Notifications view", () => {
     const item = view.locator(".notification-item");
     await expect(item).toHaveCount(1, { timeout: 10000 });
     await expect(item).toContainText("Alice");
-    await expect(item).toContainText("followed you back");
+    await expect(item).toHaveAttribute("data-teststate", "follow-back");
   });
 
   test("should not group follow-back notifications with regular follows", async ({
@@ -549,9 +547,8 @@ test.describe("Notifications view", () => {
     const view = page.locator("#notifications-view");
     const items = view.locator(".notification-item");
     await expect(items).toHaveCount(2, { timeout: 10000 });
-    await expect(items.nth(0)).toContainText("followed you back");
-    await expect(items.nth(1)).toContainText("followed you");
-    await expect(items.nth(1)).not.toContainText("followed you back");
+    await expect(items.nth(0)).toHaveAttribute("data-teststate", "follow-back");
+    await expect(items.nth(1)).toHaveAttribute("data-teststate", "follow");
   });
 
   test("should display a reply notification as a post", async ({ page }) => {
@@ -884,9 +881,9 @@ test.describe("Notifications view", () => {
     const view = page.locator("#notifications-view");
     const items = view.locator(".notification-item");
     await expect(items).toHaveCount(3, { timeout: 10000 });
-    await expect(items.nth(0)).toContainText("liked your post");
-    await expect(items.nth(1)).toContainText("reposted your post");
-    await expect(items.nth(2)).toContainText("followed you");
+    await expect(items.nth(0)).toHaveAttribute("data-teststate", "like");
+    await expect(items.nth(1)).toHaveAttribute("data-teststate", "repost");
+    await expect(items.nth(2)).toHaveAttribute("data-teststate", "follow");
   });
 
   test("should hide notifications for deleted posts", async ({ page }) => {
@@ -1046,10 +1043,9 @@ test.describe("Notifications view", () => {
     await page.goto("/notifications");
 
     const view = page.locator("#notifications-view");
-    await expect(view.locator('[data-testid="header-title"]')).toContainText(
-      "Notifications",
-      { timeout: 10000 },
-    );
+    await expect(view.locator('[data-testid="header-title"]')).toBeVisible({
+      timeout: 10000,
+    });
   });
 
   test("should navigate to post thread when clicking like notification", async ({
@@ -1508,10 +1504,9 @@ test.describe("Notifications view", () => {
     await page.goto("/notifications");
 
     const view = page.locator("#notifications-view");
-    await expect(view.locator(".error-state")).toContainText(
-      "There was an error loading notifications.",
-      { timeout: 10000 },
-    );
+    await expect(
+      view.locator('[data-testid="notifications-error"]'),
+    ).toBeVisible({ timeout: 10000 });
   });
 
   function createPagedLikeNotifications(count) {
@@ -1655,12 +1650,14 @@ test.describe("Notifications view", () => {
 
       const view = page.locator("#notifications-view");
       const tabBar = view.locator("tab-bar");
-      await expect(tabBar.locator(".tab-bar-button").nth(0)).toContainText(
-        "All",
+      await expect(tabBar.locator(".tab-bar-button").nth(0)).toHaveAttribute(
+        "data-testid",
+        "tab-all",
         { timeout: 10000 },
       );
-      await expect(tabBar.locator(".tab-bar-button").nth(1)).toContainText(
-        "Mentions",
+      await expect(tabBar.locator(".tab-bar-button").nth(1)).toHaveAttribute(
+        "data-testid",
+        "tab-mentions",
       );
     });
 
@@ -1757,7 +1754,11 @@ test.describe("Notifications view", () => {
       });
       await expect(activePanel).toContainText("Hey @testuser check this out");
       await expect(activePanel).toContainText("Great point indeed");
-      await expect(activePanel).not.toContainText("followed you");
+      await expect(
+        activePanel.locator(
+          '[data-testid="notification-item"][data-teststate="follow"]',
+        ),
+      ).toHaveCount(0);
     });
 
     test("should show empty state in Mentions tab when there are no mentions", async ({
@@ -1849,7 +1850,11 @@ test.describe("Notifications view", () => {
       await view.locator(".tab-bar-button").nth(0).click();
 
       // Both follow and mention should be visible again
-      await expect(view).toContainText("followed you", { timeout: 10000 });
+      await expect(
+        view.locator(
+          '[data-testid="notification-item"][data-teststate="follow"]',
+        ),
+      ).toBeVisible({ timeout: 10000 });
       await expect(view).toContainText("A mention post");
     });
 
@@ -2068,7 +2073,7 @@ test.describe("Notifications view", () => {
     const item = view.locator(".notification-item");
     await expect(item).toHaveCount(1, { timeout: 10000 });
     await expect(item).toContainText("Alice");
-    await expect(item).toContainText("liked your custom feed");
+    await expect(item).toHaveAttribute("data-teststate", "feedgen-like");
   });
 
   test("should group multiple feedgen-like notifications", async ({ page }) => {
@@ -2098,7 +2103,7 @@ test.describe("Notifications view", () => {
     await expect(item).toHaveCount(1, { timeout: 10000 });
     await expect(item).toContainText("Alice");
     await expect(item).toContainText("1 other");
-    await expect(item).toContainText("liked your custom feed");
+    await expect(item).toHaveAttribute("data-teststate", "feedgen-like");
     await expect(item.locator(".notification-avatar")).toHaveCount(2);
   });
 
@@ -2150,7 +2155,7 @@ test.describe("Notifications view", () => {
     const item = view.locator(".notification-item");
     await expect(item).toHaveCount(1, { timeout: 10000 });
     await expect(item).toContainText("Bob");
-    await expect(item).toContainText("signed up with your starter pack");
+    await expect(item).toHaveAttribute("data-teststate", "starterpack-joined");
   });
 
   test("should group multiple starterpack-joined notifications", async ({
@@ -2189,7 +2194,7 @@ test.describe("Notifications view", () => {
     await expect(item).toHaveCount(1, { timeout: 10000 });
     await expect(item).toContainText("Alice");
     await expect(item).toContainText("2 others");
-    await expect(item).toContainText("signed up with your starter pack");
+    await expect(item).toHaveAttribute("data-teststate", "starterpack-joined");
     await expect(item.locator(".notification-avatar")).toHaveCount(3);
   });
 
@@ -2239,7 +2244,7 @@ test.describe("Notifications view", () => {
     const item = view.locator(".notification-item");
     await expect(item).toHaveCount(1, { timeout: 10000 });
     await expect(item).toContainText("Alice");
-    await expect(item).toContainText("verified you");
+    await expect(item).toHaveAttribute("data-teststate", "verified");
   });
 
   test("should group multiple verified notifications", async ({ page }) => {
@@ -2266,7 +2271,7 @@ test.describe("Notifications view", () => {
     await expect(item).toHaveCount(1, { timeout: 10000 });
     await expect(item).toContainText("Alice");
     await expect(item).toContainText("1 other");
-    await expect(item).toContainText("verified you");
+    await expect(item).toHaveAttribute("data-teststate", "verified");
     await expect(item.locator(".notification-avatar")).toHaveCount(2);
   });
 
@@ -2340,9 +2345,8 @@ test.describe("Notifications view", () => {
     const view = page.locator("#notifications-view");
     const item = view.locator(".notification-item");
     await expect(item).toHaveCount(1, { timeout: 10000 });
-    await expect(item).toContainText("Your contact");
+    await expect(item).toHaveAttribute("data-teststate", "contact-match");
     await expect(item).toContainText("Charlie");
-    await expect(item).toContainText("is on Bluesky");
   });
 
   test("should navigate to profile when clicking contact-match notification", async ({
@@ -2416,13 +2420,20 @@ test.describe("Notifications view", () => {
     const view = page.locator("#notifications-view");
     const items = view.locator(".notification-item");
     await expect(items).toHaveCount(5, { timeout: 10000 });
-    await expect(items.nth(0)).toContainText("liked your custom feed");
-    await expect(items.nth(1)).toContainText(
-      "signed up with your starter pack",
+    await expect(items.nth(0)).toHaveAttribute(
+      "data-teststate",
+      "feedgen-like",
+    );
+    await expect(items.nth(1)).toHaveAttribute(
+      "data-teststate",
+      "starterpack-joined",
+    );
+    await expect(items.nth(2)).toHaveAttribute("data-teststate", "verified");
+    await expect(items.nth(3)).toHaveAttribute("data-teststate", "unverified");
+    await expect(items.nth(4)).toHaveAttribute(
+      "data-teststate",
+      "contact-match",
     );
-    await expect(items.nth(2)).toContainText("verified you");
-    await expect(items.nth(3)).toContainText("removed their verification");
-    await expect(items.nth(4)).toContainText("is on Bluesky");
   });
 
   test("shows live ring and pill on a stacked notification avatar for a live actor", async ({
diff --git a/tests/e2e/specs/views/postLikes.view.test.js b/tests/e2e/specs/views/postLikes.view.test.js
index 42c8b571..b42af0d6 100644
--- a/tests/e2e/specs/views/postLikes.view.test.js
+++ b/tests/e2e/specs/views/postLikes.view.test.js
@@ -48,10 +48,9 @@ test.describe("Post likes view", () => {
     await page.goto("/profile/author1.bsky.social/post/abc123/likes");
 
     const view = page.locator("#post-likes-view");
-    await expect(view.locator('[data-testid="header-title"]')).toContainText(
-      "Liked by",
-      { timeout: 10000 },
-    );
+    await expect(view.locator('[data-testid="header-title"]')).toBeVisible({
+      timeout: 10000,
+    });
 
     await expect(view.locator('[data-testid="header-subtitle"]')).toContainText(
       "3 likes",
@@ -146,10 +145,9 @@ test.describe("Post likes view", () => {
     await page.goto("/profile/author1.bsky.social/post/abc123/likes");
 
     const view = page.locator("#post-likes-view");
-    await expect(view.locator('[data-testid="header-title"]')).toContainText(
-      "Liked by",
-      { timeout: 10000 },
-    );
+    await expect(view.locator('[data-testid="header-title"]')).toBeVisible({
+      timeout: 10000,
+    });
 
     await expect(view.locator('[data-testid="empty-state"]')).toBeVisible({
       timeout: 10000,
@@ -176,10 +174,9 @@ test.describe("Post likes view", () => {
     await page.goto("/profile/author1.bsky.social/post/abc123/likes");
 
     const view = page.locator("#post-likes-view");
-    await expect(view.locator(".error-state")).toContainText(
-      "Error loading likes",
-      { timeout: 10000 },
-    );
+    await expect(view.locator('[data-testid="likes-error"]')).toBeVisible({
+      timeout: 10000,
+    });
   });
 
   test("should render bio, follows-you, and follow-state per liker", async ({
@@ -307,10 +304,9 @@ test.describe("Post likes view", () => {
       await page.goto("/profile/author1.bsky.social/post/abc123/likes");
 
       const view = page.locator("#post-likes-view");
-      await expect(view.locator('[data-testid="header-title"]')).toContainText(
-        "Liked by",
-        { timeout: 10000 },
-      );
+      await expect(view.locator('[data-testid="header-title"]')).toBeVisible({
+        timeout: 10000,
+      });
 
       await expect(view.locator(".profile-list-item")).toHaveCount(3, {
         timeout: 10000,
diff --git a/tests/e2e/specs/views/postQuotes.view.test.js b/tests/e2e/specs/views/postQuotes.view.test.js
index 0929f1b0..03d89025 100644
--- a/tests/e2e/specs/views/postQuotes.view.test.js
+++ b/tests/e2e/specs/views/postQuotes.view.test.js
@@ -38,10 +38,9 @@ test.describe("Post quotes view", () => {
     await page.goto("/profile/author1.bsky.social/post/abc123/quotes");
 
     const view = page.locator("#post-quotes-view");
-    await expect(view.locator('[data-testid="header-title"]')).toContainText(
-      "Quotes",
-      { timeout: 10000 },
-    );
+    await expect(view.locator('[data-testid="header-title"]')).toBeVisible({
+      timeout: 10000,
+    });
 
     await expect(view.locator('[data-testid="header-subtitle"]')).toContainText(
       "2 quotes",
@@ -95,15 +94,13 @@ test.describe("Post quotes view", () => {
     await page.goto("/profile/author1.bsky.social/post/abc123/quotes");
 
     const view = page.locator("#post-quotes-view");
-    await expect(view.locator('[data-testid="header-title"]')).toContainText(
-      "Quotes",
-      { timeout: 10000 },
-    );
+    await expect(view.locator('[data-testid="header-title"]')).toBeVisible({
+      timeout: 10000,
+    });
 
-    await expect(view.locator(".feed-end-message")).toContainText(
-      "No quotes yet.",
-      { timeout: 10000 },
-    );
+    await expect(view.locator('[data-testid="empty-state"]')).toBeVisible({
+      timeout: 10000,
+    });
   });
 
   test("should display error state when quotes fail to load", async ({
@@ -126,10 +123,9 @@ test.describe("Post quotes view", () => {
     await page.goto("/profile/author1.bsky.social/post/abc123/quotes");
 
     const view = page.locator("#post-quotes-view");
-    await expect(view.locator(".error-state")).toContainText(
-      "Error loading quotes",
-      { timeout: 10000 },
-    );
+    await expect(view.locator('[data-testid="quotes-error"]')).toBeVisible({
+      timeout: 10000,
+    });
   });
 
   test.describe("Logged-out behavior", () => {
@@ -142,10 +138,9 @@ test.describe("Post quotes view", () => {
       await page.goto("/profile/author1.bsky.social/post/abc123/quotes");
 
       const view = page.locator("#post-quotes-view");
-      await expect(view.locator('[data-testid="header-title"]')).toContainText(
-        "Quotes",
-        { timeout: 10000 },
-      );
+      await expect(view.locator('[data-testid="header-title"]')).toBeVisible({
+        timeout: 10000,
+      });
 
       await expect(view.locator('[data-testid="small-post"]')).toHaveCount(2, {
         timeout: 10000,
diff --git a/tests/e2e/specs/views/postReposts.view.test.js b/tests/e2e/specs/views/postReposts.view.test.js
index c219069a..cccf8e95 100644
--- a/tests/e2e/specs/views/postReposts.view.test.js
+++ b/tests/e2e/specs/views/postReposts.view.test.js
@@ -44,10 +44,9 @@ test.describe("Post reposts view", () => {
     await page.goto("/profile/author1.bsky.social/post/abc123/reposts");
 
     const view = page.locator("#post-reposts-view");
-    await expect(view.locator('[data-testid="header-title"]')).toContainText(
-      "Reposted by",
-      { timeout: 10000 },
-    );
+    await expect(view.locator('[data-testid="header-title"]')).toBeVisible({
+      timeout: 10000,
+    });
 
     await expect(view.locator('[data-testid="header-subtitle"]')).toContainText(
       "3 reposts",
@@ -102,10 +101,9 @@ test.describe("Post reposts view", () => {
     await page.goto("/profile/author1.bsky.social/post/abc123/reposts");
 
     const view = page.locator("#post-reposts-view");
-    await expect(view.locator('[data-testid="header-title"]')).toContainText(
-      "Reposted by",
-      { timeout: 10000 },
-    );
+    await expect(view.locator('[data-testid="header-title"]')).toBeVisible({
+      timeout: 10000,
+    });
 
     await expect(view.locator('[data-testid="empty-state"]')).toBeVisible({
       timeout: 10000,
@@ -132,10 +130,9 @@ test.describe("Post reposts view", () => {
     await page.goto("/profile/author1.bsky.social/post/abc123/reposts");
 
     const view = page.locator("#post-reposts-view");
-    await expect(view.locator(".error-state")).toContainText(
-      "Error loading reposts",
-      { timeout: 10000 },
-    );
+    await expect(view.locator('[data-testid="reposts-error"]')).toBeVisible({
+      timeout: 10000,
+    });
   });
 
   test("should render bio, follows-you, and follow-state per reposter", async ({
@@ -257,10 +254,9 @@ test.describe("Post reposts view", () => {
       await page.goto("/profile/author1.bsky.social/post/abc123/reposts");
 
       const view = page.locator("#post-reposts-view");
-      await expect(view.locator('[data-testid="header-title"]')).toContainText(
-        "Reposted by",
-        { timeout: 10000 },
-      );
+      await expect(view.locator('[data-testid="header-title"]')).toBeVisible({
+        timeout: 10000,
+      });
 
       await expect(view.locator(".profile-list-item")).toHaveCount(3, {
         timeout: 10000,
diff --git a/tests/e2e/specs/views/postThread.view.test.js b/tests/e2e/specs/views/postThread.view.test.js
index bbd6778d..16baa3fb 100644
--- a/tests/e2e/specs/views/postThread.view.test.js
+++ b/tests/e2e/specs/views/postThread.view.test.js
@@ -75,10 +75,9 @@ test.describe("Post thread view", () => {
     await page.goto("/profile/author1.bsky.social/post/abc123");
 
     const view = page.locator("#post-detail-view");
-    await expect(view.locator('[data-testid="header-title"]')).toContainText(
-      "Post",
-      { timeout: 10000 },
-    );
+    await expect(view.locator('[data-testid="header-title"]')).toBeVisible({
+      timeout: 10000,
+    });
 
     await expect(view.locator('[data-testid="large-post"]')).toBeVisible({
       timeout: 10000,
@@ -682,10 +681,9 @@ test.describe("Post thread view", () => {
     await page.goto("/profile/author1.bsky.social/post/abc123");
 
     const view = page.locator("#post-detail-view");
-    await expect(view.locator(".post-thread-reply-prompt")).toContainText(
-      "Write your reply",
-      { timeout: 10000 },
-    );
+    await expect(
+      view.locator('[data-testid="post-thread-reply-prompt"]'),
+    ).toBeVisible({ timeout: 10000 });
   });
 
   test("should display post action counts on the main post", async ({
@@ -872,10 +870,9 @@ test.describe("Post thread view", () => {
     await page.goto("/profile/author1.bsky.social/post/abc123");
 
     const view = page.locator("#post-detail-view");
-    await expect(view.locator(".post-thread-reply-prompt")).toContainText(
-      "Write your reply",
-      { timeout: 10000 },
-    );
+    await expect(
+      view.locator('[data-testid="post-thread-reply-prompt"]'),
+    ).toBeVisible({ timeout: 10000 });
 
     // Click the reply prompt to open the composer
     await view.locator(".post-thread-reply-prompt").click();
@@ -1159,10 +1156,9 @@ test.describe("Post thread view", () => {
       await page.goto("/profile/restricted.bsky.social/post/abc123");
 
       const view = page.locator("#post-detail-view");
-      await expect(view).toContainText(
-        "This author has chosen to make their posts visible only to people who are signed in.",
-        { timeout: 10000 },
-      );
+      await expect(
+        view.locator('[data-testid="no-unauthenticated-message"]'),
+      ).toBeVisible({ timeout: 10000 });
       await expect(view).not.toContainText("This post is restricted");
     });
 
@@ -1208,10 +1204,9 @@ test.describe("Post thread view", () => {
       await page.goto("/profile/author1.bsky.social/post/abc123");
 
       const view = page.locator("#post-detail-view");
-      await expect(view).toContainText(
-        "This author has chosen to make their posts visible only to people who are signed in.",
-        { timeout: 10000 },
-      );
+      await expect(
+        view.locator('[data-testid="no-unauthenticated-message"]'),
+      ).toBeVisible({ timeout: 10000 });
       await expect(view).not.toContainText("Restricted parent");
       await expect(view).toContainText("This is a reply to restricted parent");
     });
@@ -1673,8 +1668,8 @@ test.describe("Post thread view", () => {
       const hiddenSection = view.locator("hidden-replies-section");
       await expect(hiddenSection).toBeVisible();
       await expect(
-        hiddenSection.locator(".hidden-replies-button"),
-      ).toContainText("Show more replies");
+        hiddenSection.locator('[data-testid="hidden-replies-button"]'),
+      ).toBeVisible();
     });
 
     test("should place content-labeled replies in the hidden section", async ({
@@ -1925,8 +1920,8 @@ test.describe("Post thread view", () => {
       const hiddenSection = view.locator("hidden-replies-section");
       await expect(hiddenSection).toBeVisible();
       await expect(
-        hiddenSection.locator(".hidden-replies-button"),
-      ).toContainText("Show more replies");
+        hiddenSection.locator('[data-testid="hidden-replies-button"]'),
+      ).toBeVisible();
     });
 
     test("should not affect replies when getPostThreadOtherV2 returns empty", async ({
@@ -2240,7 +2235,7 @@ test.describe("Post thread view", () => {
       const view = page.locator("#post-detail-view");
       const toggle = view.locator("muted-parent-toggle");
       await expect(toggle).toBeVisible({ timeout: 10000 });
-      await expect(toggle).toContainText("Hidden by muted word");
+      await expect(toggle).toHaveAttribute("data-teststate", "muted-word");
     });
 
     test("should show 'Post hidden by you' label for parent with viewer.isHidden", async ({
@@ -2286,7 +2281,7 @@ test.describe("Post thread view", () => {
       const view = page.locator("#post-detail-view");
       const toggle = view.locator("muted-parent-toggle");
       await expect(toggle).toBeVisible({ timeout: 10000 });
-      await expect(toggle).toContainText("Post hidden by you");
+      await expect(toggle).toHaveAttribute("data-teststate", "hidden");
     });
   });
 
@@ -2546,7 +2541,7 @@ test.describe("Post thread view", () => {
         timeout: 10000,
       });
       const badge = page.locator('[data-testid="who-can-reply-badge"]');
-      await expect(badge).toHaveText("Everybody can reply");
+      await expect(badge).toHaveAttribute("data-teststate", "everybody");
       await expect(
         badge.locator('app-icon[icon="globe-grid-line"]'),
       ).toBeVisible();
@@ -2576,11 +2571,15 @@ test.describe("Post thread view", () => {
       await page.goto("/profile/author1.bsky.social/post/abc123");
 
       const badge = page.locator('[data-testid="who-can-reply-badge"]');
-      await expect(badge).toHaveText("Replies disabled", { timeout: 10000 });
+      await expect(badge).toHaveAttribute("data-teststate", "nobody", {
+        timeout: 10000,
+      });
 
       await badge.click();
       const modal = page.locator('[data-testid="who-can-reply-modal"]');
-      await expect(modal).toContainText("Replies to this post are disabled.");
+      await expect(
+        modal.locator('[data-testid="who-can-reply-rule"]'),
+      ).toHaveAttribute("data-teststate", "nobody");
 
       await modal.locator(".primary-button").click();
       await expect(modal).not.toBeAttached();
@@ -2624,13 +2623,17 @@ test.describe("Post thread view", () => {
       await page.goto("/profile/author1.bsky.social/post/abc123");
 
       const badge = page.locator('[data-testid="who-can-reply-badge"]');
-      await expect(badge).toHaveText("Some people can reply", {
+      await expect(badge).toHaveAttribute("data-teststate", "limited", {
         timeout: 10000,
       });
 
       await badge.click();
       const modal = page.locator('[data-testid="who-can-reply-modal"]');
-      await expect(modal).toContainText("mentioned users");
+      await expect(
+        modal.locator(
+          '[data-testid="who-can-reply-rule-item"][data-teststate="mention"]',
+        ),
+      ).toBeVisible();
       await expect(modal).toContainText(
         "users followed by @author1.bsky.social",
       );
@@ -2656,14 +2659,18 @@ test.describe("Post thread view", () => {
       await page.goto("/profile/author1.bsky.social/post/abc123");
 
       const badge = page.locator('[data-testid="who-can-reply-badge"]');
-      await expect(badge).toHaveText("Everybody can reply", { timeout: 10000 });
+      await expect(badge).toHaveAttribute("data-teststate", "everybody", {
+        timeout: 10000,
+      });
 
       await badge.click();
       const modal = page.locator('[data-testid="who-can-reply-modal"]');
-      await expect(modal).toContainText("Everybody can reply to this post.");
-      await expect(modal).toContainText(
-        "No one but the author can quote this post.",
-      );
+      await expect(
+        modal.locator('[data-testid="who-can-reply-rule"]'),
+      ).toHaveAttribute("data-teststate", "everybody");
+      await expect(
+        modal.locator('[data-testid="who-can-reply-quote-disabled"]'),
+      ).toBeVisible();
     });
   });
 
diff --git a/tests/e2e/specs/views/profile.view.test.js b/tests/e2e/specs/views/profile.view.test.js
index 27ba134b..daca683c 100644
--- a/tests/e2e/specs/views/profile.view.test.js
+++ b/tests/e2e/specs/views/profile.view.test.js
@@ -278,9 +278,9 @@ test.describe("Profile view", () => {
     await page.goto(`/profile/${followingUser.did}`);
 
     const view = page.locator("#profile-view");
-    await expect(
-      view.locator('[data-testid="follows-you-badge"]'),
-    ).toContainText("Follows you", { timeout: 10000 });
+    await expect(view.locator('[data-testid="follows-you-badge"]')).toBeVisible(
+      { timeout: 10000 },
+    );
   });
 
   test("should show '+ Follow' button for unfollowed profiles", async ({
@@ -421,14 +421,17 @@ test.describe("Profile view", () => {
     await expect(tabBar.locator(".tab-bar-button")).toHaveCount(3, {
       timeout: 10000,
     });
-    await expect(tabBar.locator(".tab-bar-button").nth(0)).toContainText(
-      "Posts",
+    await expect(tabBar.locator(".tab-bar-button").nth(0)).toHaveAttribute(
+      "data-testid",
+      "tab-posts",
     );
-    await expect(tabBar.locator(".tab-bar-button").nth(1)).toContainText(
-      "Replies",
+    await expect(tabBar.locator(".tab-bar-button").nth(1)).toHaveAttribute(
+      "data-testid",
+      "tab-replies",
     );
-    await expect(tabBar.locator(".tab-bar-button").nth(2)).toContainText(
-      "Media",
+    await expect(tabBar.locator(".tab-bar-button").nth(2)).toHaveAttribute(
+      "data-testid",
+      "tab-media",
     );
   });
 
@@ -565,8 +568,9 @@ test.describe("Profile view", () => {
     await expect(tabBar.locator(".tab-bar-button")).toHaveCount(5, {
       timeout: 10000,
     });
-    await expect(tabBar.locator(".tab-bar-button").nth(3)).toContainText(
-      "Likes",
+    await expect(tabBar.locator(".tab-bar-button").nth(3)).toHaveAttribute(
+      "data-testid",
+      "tab-likes",
     );
     await expect(
       tabBar.locator('[data-testid="tab-starter-packs"]'),
@@ -681,20 +685,17 @@ test.describe("Profile view", () => {
     await page.goto(`/profile/${blockedUser.did}`);
 
     const view = page.locator("#profile-view");
-    await expect(view.locator('[data-testid="blocked-badge"]')).toContainText(
-      "You are blocking this user",
-      { timeout: 10000 },
-    );
-    await expect(view.locator(".feed-end-message")).toContainText(
-      "Posts hidden",
-    );
+    await expect(view.locator('[data-testid="blocked-badge"]')).toBeVisible({
+      timeout: 10000,
+    });
+    await expect(
+      view.locator('[data-testid="profile-posts-hidden"]'),
+    ).toBeVisible();
     // Should not show follow button; should show unblock button instead
     await expect(
       view.locator('[data-testid="follow-button"]'),
     ).not.toBeVisible();
-    await expect(view.locator('[data-testid="unblock-button"]')).toContainText(
-      "Unblock",
-    );
+    await expect(view.locator('[data-testid="unblock-button"]')).toBeVisible();
   });
 
   test("should not show 'Follows you' badge for blocked profiles", async ({
@@ -796,9 +797,9 @@ test.describe("Profile view", () => {
       timeout: 10000,
     });
     await expect(view.locator("tab-bar")).not.toBeVisible();
-    await expect(view.locator(".feed-end-message")).toContainText(
-      "Posts hidden",
-    );
+    await expect(
+      view.locator('[data-testid="profile-posts-hidden"]'),
+    ).toBeVisible();
   });
 
   test("should navigate to profile by handle", async ({ page }) => {
@@ -1197,10 +1198,9 @@ test.describe("Profile view", () => {
     await page.goto("/profile/did:plc:erroruser");
 
     const view = page.locator("#profile-view");
-    await expect(view.locator(".error-state")).toContainText(
-      "There was an error loading the profile.",
-      { timeout: 10000 },
-    );
+    await expect(view.locator('[data-testid="profile-error"]')).toBeVisible({
+      timeout: 10000,
+    });
   });
 
   test("should display invalid handle error for malformed handles", async ({
@@ -1229,9 +1229,9 @@ test.describe("Profile view", () => {
     await page.goto("/profile/did:plc:invaliduser");
 
     const view = page.locator("#profile-view");
-    await expect(view.locator(".error-state h3")).toContainText("Not Found", {
-      timeout: 10000,
-    });
+    await expect(view.locator('[data-testid="profile-not-found"]')).toBeVisible(
+      { timeout: 10000 },
+    );
     await expect(view.locator(".error-state")).toContainText("Invalid handle");
   });
 
@@ -1258,9 +1258,9 @@ test.describe("Profile view", () => {
     await page.goto("/profile/did:plc:suspendeduser");
 
     const view = page.locator("#profile-view");
-    await expect(view.locator(".error-state h3")).toContainText("Not Found", {
-      timeout: 10000,
-    });
+    await expect(view.locator('[data-testid="profile-not-found"]')).toBeVisible(
+      { timeout: 10000 },
+    );
     await expect(view.locator(".error-state")).toContainText(
       "Account has been suspended",
     );
@@ -1289,9 +1289,9 @@ test.describe("Profile view", () => {
     await page.goto("/profile/did:plc:deactivateduser");
 
     const view = page.locator("#profile-view");
-    await expect(view.locator(".error-state h3")).toContainText("Not Found", {
-      timeout: 10000,
-    });
+    await expect(view.locator('[data-testid="profile-not-found"]')).toBeVisible(
+      { timeout: 10000 },
+    );
     await expect(view.locator(".error-state")).toContainText(
       "Account is deactivated",
     );
@@ -1320,9 +1320,9 @@ test.describe("Profile view", () => {
     await page.goto("/profile/did:plc:missinguser");
 
     const view = page.locator("#profile-view");
-    await expect(view.locator(".error-state h3")).toContainText("Not Found", {
-      timeout: 10000,
-    });
+    await expect(view.locator('[data-testid="profile-not-found"]')).toBeVisible(
+      { timeout: 10000 },
+    );
     await expect(view.locator(".error-state")).toContainText(
       "Profile not found",
     );
@@ -1346,12 +1346,12 @@ test.describe("Profile view", () => {
     await page.goto(`/profile/${blockedByUser.did}`);
 
     const view = page.locator("#profile-view");
+    await expect(view.locator('[data-testid="blocked-by-badge"]')).toBeVisible({
+      timeout: 10000,
+    });
     await expect(
-      view.locator('[data-testid="blocked-by-badge"]'),
-    ).toContainText("This user is blocking you", { timeout: 10000 });
-    await expect(view.locator(".feed-end-message")).toContainText(
-      "Posts hidden",
-    );
+      view.locator('[data-testid="profile-posts-hidden"]'),
+    ).toBeVisible();
     await expect(view.locator("tab-bar")).not.toBeVisible();
     await expect(
       view.locator('[data-testid="follow-button"]'),
@@ -1535,12 +1535,6 @@ test.describe("Profile view", () => {
 
       const dialog = page.locator(".post-notifications-dialog");
       await expect(dialog).toBeVisible();
-      await expect(
-        page.locator(".post-notifications-dialog-title"),
-      ).toContainText("Keep me posted");
-      await expect(
-        page.locator(".post-notifications-dialog-subtitle"),
-      ).toContainText("Get notified of this account's activity");
     });
 
     test("should show Posts and Replies toggles in dialog", async ({
@@ -2025,9 +2019,15 @@ test.describe("Profile view", () => {
         .nth(0)
         .locator('[data-testid="label-pref-button"]');
       await expect(firstRowButtons).toHaveCount(3);
-      await expect(firstRowButtons.nth(0)).toContainText("Off");
+      await expect(firstRowButtons.nth(0)).toHaveAttribute(
+        "data-teststate",
+        "off",
+      );
       await expect(firstRowButtons.nth(1)).toContainText("Warn");
-      await expect(firstRowButtons.nth(2)).toContainText("Hide");
+      await expect(firstRowButtons.nth(2)).toHaveAttribute(
+        "data-teststate",
+        "hide",
+      );
 
       // Second row: badge-label (blurs: "none", severity: "inform")
       // isBadgeLabel = true, severity = "inform", so Warn text is "Show badge"
@@ -2035,9 +2035,15 @@ test.describe("Profile view", () => {
         .nth(1)
         .locator('[data-testid="label-pref-button"]');
       await expect(secondRowButtons).toHaveCount(3);
-      await expect(secondRowButtons.nth(0)).toContainText("Off");
+      await expect(secondRowButtons.nth(0)).toHaveAttribute(
+        "data-teststate",
+        "off",
+      );
       await expect(secondRowButtons.nth(1)).toContainText("Show badge");
-      await expect(secondRowButtons.nth(2)).toContainText("Hide");
+      await expect(secondRowButtons.nth(2)).toHaveAttribute(
+        "data-teststate",
+        "hide",
+      );
     });
 
     test("should show label descriptions for each configurable label", async ({
@@ -2176,11 +2182,13 @@ test.describe("Profile view", () => {
       await expect(tabBar.locator(".tab-bar-button")).toHaveCount(2, {
         timeout: 10000,
       });
-      await expect(tabBar.locator(".tab-bar-button").nth(0)).toContainText(
-        "Posts",
+      await expect(tabBar.locator(".tab-bar-button").nth(0)).toHaveAttribute(
+        "data-testid",
+        "tab-posts",
       );
-      await expect(tabBar.locator(".tab-bar-button").nth(1)).toContainText(
-        "Media",
+      await expect(tabBar.locator(".tab-bar-button").nth(1)).toHaveAttribute(
+        "data-testid",
+        "tab-media",
       );
     });
 
@@ -2285,13 +2293,9 @@ test.describe("Profile view", () => {
       await page.goto(`/profile/${restrictedUser.did}`);
 
       const view = page.locator("#profile-view");
-      await expect(view.locator(".error-state h1")).toContainText(
-        "Sign-In Required",
-        { timeout: 10000 },
-      );
-      await expect(view.locator(".error-state p")).toContainText(
-        "This account has requested that users sign in to view their profile.",
-      );
+      await expect(
+        view.locator('[data-testid="profile-sign-in-required"]'),
+      ).toBeVisible({ timeout: 10000 });
     });
   });
 
@@ -2371,8 +2375,9 @@ test.describe("Profile view", () => {
       });
 
       await tabBar.locator('[data-testid="tab-feeds"]').click();
-      await expect(tabBar.locator(".tab-bar-button.active")).toContainText(
-        "Feeds",
+      await expect(tabBar.locator('[data-testid="tab-feeds"]')).toHaveAttribute(
+        "data-teststate",
+        "active",
       );
 
       const feedsList = view.locator(".feeds-list");
diff --git a/tests/e2e/specs/views/profileFollowers.view.test.js b/tests/e2e/specs/views/profileFollowers.view.test.js
index 9d5e7caa..1b2a72ca 100644
--- a/tests/e2e/specs/views/profileFollowers.view.test.js
+++ b/tests/e2e/specs/views/profileFollowers.view.test.js
@@ -208,10 +208,9 @@ test.describe("Profile followers view", () => {
     await page.goto(`/profile/${profileUser.did}/followers`);
 
     const view = page.locator("#profile-followers-view");
-    await expect(view.locator(".error-state")).toContainText(
-      "Error loading followers",
-      { timeout: 10000 },
-    );
+    await expect(view.locator('[data-testid="followers-error"]')).toBeVisible({
+      timeout: 10000,
+    });
   });
 
   test("should render bio, follows-you, and follow-state per follower", async ({
diff --git a/tests/e2e/specs/views/profileFollowing.view.test.js b/tests/e2e/specs/views/profileFollowing.view.test.js
index 62e2aa7e..15f13ddd 100644
--- a/tests/e2e/specs/views/profileFollowing.view.test.js
+++ b/tests/e2e/specs/views/profileFollowing.view.test.js
@@ -126,10 +126,9 @@ test.describe("Profile following view", () => {
     await page.goto(`/profile/${profileUser.did}/following`);
 
     const view = page.locator("#profile-following-view");
-    await expect(view.locator(".error-state")).toContainText(
-      "Error loading following",
-      { timeout: 10000 },
-    );
+    await expect(view.locator('[data-testid="following-error"]')).toBeVisible({
+      timeout: 10000,
+    });
   });
 
   test("should render bio, follows-you, and follow-state per following", async ({
diff --git a/tests/e2e/specs/views/profileKnownFollowers.view.test.js b/tests/e2e/specs/views/profileKnownFollowers.view.test.js
index 423fbf9d..36e87836 100644
--- a/tests/e2e/specs/views/profileKnownFollowers.view.test.js
+++ b/tests/e2e/specs/views/profileKnownFollowers.view.test.js
@@ -46,10 +46,9 @@ test.describe("Profile known followers view", () => {
       { timeout: 10000 },
     );
 
-    await expect(view.locator('[data-testid="header-subtitle"]')).toContainText(
-      "Followers you know",
-      { timeout: 10000 },
-    );
+    await expect(view.locator('[data-testid="header-subtitle"]')).toBeVisible({
+      timeout: 10000,
+    });
 
     await expect(view.locator(".profile-list-item")).toHaveCount(3, {
       timeout: 10000,
@@ -169,10 +168,9 @@ test.describe("Profile known followers view", () => {
     await page.goto(`/profile/${profileUser.did}/known-followers`);
 
     const view = page.locator("#profile-known-followers-view");
-    await expect(view.locator(".error-state")).toContainText(
-      "Error loading followers you know",
-      { timeout: 10000 },
-    );
+    await expect(
+      view.locator('[data-testid="known-followers-error"]'),
+    ).toBeVisible({ timeout: 10000 });
   });
 
   test("should render bio, follows-you, and follow-state per known follower", async ({
diff --git a/tests/e2e/specs/views/search.view.test.js b/tests/e2e/specs/views/search.view.test.js
index 90118d16..0efda483 100644
--- a/tests/e2e/specs/views/search.view.test.js
+++ b/tests/e2e/specs/views/search.view.test.js
@@ -25,9 +25,6 @@ test.describe("Search view", () => {
     await expect(
       view.locator('[data-testid="search-placeholder"]'),
     ).toBeVisible();
-    await expect(
-      view.locator('[data-testid="search-placeholder"]'),
-    ).toContainText("Start typing to search for users, posts, and feeds.");
   });
 
   test("should display profile search results", async ({ page }) => {
@@ -745,17 +742,17 @@ test.describe("Search view", () => {
 
     // First feed is pinned — should show "Unpin" with pinned class
     await expect(firstItem.locator(".pin-feed-button.pinned")).toBeVisible();
-    await expect(firstItem.locator(".pin-feed-button")).toContainText(
-      "Unpin feed",
-    );
+    await expect(
+      firstItem.locator('[data-testid="pin-feed-button"]'),
+    ).toHaveAttribute("data-teststate", "pinned");
 
     // Second feed is not pinned — should show "Pin feed" with primary class
     await expect(
       secondItem.locator(".pin-feed-button.rounded-button-primary"),
     ).toBeVisible();
-    await expect(secondItem.locator(".pin-feed-button")).toContainText(
-      "Pin feed",
-    );
+    await expect(
+      secondItem.locator('[data-testid="pin-feed-button"]'),
+    ).toHaveAttribute("data-teststate", "not-pinned");
   });
 
   test("should not navigate to feed detail when clicking pin button", async ({
diff --git a/tests/e2e/specs/views/settings.view.test.js b/tests/e2e/specs/views/settings.view.test.js
index 6f4456d6..fff8ccc3 100644
--- a/tests/e2e/specs/views/settings.view.test.js
+++ b/tests/e2e/specs/views/settings.view.test.js
@@ -13,10 +13,9 @@ test.describe("Settings view", () => {
     await page.goto("/settings");
 
     const view = page.locator("#settings-view");
-    await expect(view.locator('[data-testid="header-title"]')).toContainText(
-      "Settings",
-      { timeout: 10000 },
-    );
+    await expect(view.locator('[data-testid="header-title"]')).toBeVisible({
+      timeout: 10000,
+    });
 
     const nav = view.locator(".vertical-nav");
     // 7 menu items + Switch account toggle + Sign out (accounts list is collapsed by default)
@@ -140,7 +139,7 @@ test.describe("Settings view", () => {
         '[data-testid="settings-switch-account-toggle"]',
       );
       await expect(toggle).toBeVisible({ timeout: 10000 });
-      await expect(toggle).toContainText("Add another account");
+      await expect(toggle).toHaveAttribute("data-teststate", "add");
       // No dropdown, no avatar stack.
       await expect(
         view.locator('[data-testid="settings-account-avatar-stack"]'),
@@ -223,7 +222,7 @@ test.describe("Settings view", () => {
         '[data-testid="settings-switch-account-toggle"]',
       );
       await expect(toggle).toBeVisible({ timeout: 10000 });
-      await expect(toggle).toContainText("Switch account");
+      await expect(toggle).toHaveAttribute("data-teststate", "collapsed");
       await toggle.click();
 
       const row = view.locator('[data-testid="settings-account-row"]');
diff --git a/tests/e2e/specs/views/settings/advanced.view.test.js b/tests/e2e/specs/views/settings/advanced.view.test.js
index f3a8ffc0..654a85ef 100644
--- a/tests/e2e/specs/views/settings/advanced.view.test.js
+++ b/tests/e2e/specs/views/settings/advanced.view.test.js
@@ -18,12 +18,10 @@ test.describe("Settings Advanced view", () => {
     await page.goto("/settings/advanced");
 
     const view = page.locator("#settings-advanced-view");
-    await expect(view.locator('[data-testid="header-title"]')).toContainText(
-      "Advanced",
-      { timeout: 10000 },
-    );
+    await expect(view.locator('[data-testid="header-title"]')).toBeVisible({
+      timeout: 10000,
+    });
 
-    await expect(view).toContainText("App View");
     await expect(view.locator('select[name="appview"]')).toBeVisible();
   });
 
@@ -40,8 +38,8 @@ test.describe("Settings Advanced view", () => {
     const select = view.locator('select[name="appview"]');
     await expect(select).toBeVisible({ timeout: 10000 });
     const options = select.locator("option");
-    await expect(options.first()).toHaveText("Bluesky");
-    await expect(options.last()).toHaveText("Custom");
+    await expect(options.first()).toHaveAttribute("value", "bluesky");
+    await expect(options.last()).toHaveAttribute("value", "custom");
     expect(await options.count()).toBeGreaterThanOrEqual(3);
   });
 
@@ -143,7 +141,7 @@ test.describe("Settings Advanced view", () => {
     const select = view.locator('select[name="appview"]');
     await expect(select).toBeVisible({ timeout: 10000 });
 
-    const applyButton = view.getByRole("button", { name: "Save and reload" });
+    const applyButton = view.locator('[data-testid="appview-save-button"]');
     await expect(applyButton).toBeDisabled();
 
     await select.selectOption("blacksky");
@@ -174,7 +172,7 @@ test.describe("Settings Advanced view", () => {
     await page.goto("/settings/advanced");
 
     const view = page.locator("#settings-advanced-view");
-    const applyButton = view.getByRole("button", { name: "Save and reload" });
+    const applyButton = view.locator('[data-testid="appview-save-button"]');
     await expect(view.locator('select[name="appview"]')).toHaveValue("custom", {
       timeout: 10000,
     });
@@ -202,7 +200,7 @@ test.describe("Settings Advanced view", () => {
     await expect(select).toBeVisible({ timeout: 10000 });
 
     await select.selectOption("blacksky");
-    await view.getByRole("button", { name: "Save and reload" }).click();
+    await view.locator('[data-testid="appview-save-button"]').click();
 
     await page.waitForURL("/settings/advanced", { timeout: 10000 });
 
@@ -222,12 +220,9 @@ test.describe("Settings Advanced view", () => {
       await page.goto("/settings/advanced");
 
       const view = page.locator("#settings-advanced-view");
-      await expect(view).toContainText("Install plugin from URL", {
-        timeout: 10000,
-      });
       await expect(
         view.locator('[data-testid="install-unregistered-plugin-input"]'),
-      ).toBeVisible();
+      ).toBeVisible({ timeout: 10000 });
       await expect(
         view.locator('[data-testid="install-unregistered-plugin-submit"]'),
       ).toBeVisible();
@@ -303,8 +298,8 @@ test.describe("Settings Advanced view", () => {
       await expect(select).toBeVisible({ timeout: 10000 });
       await expect(select).toHaveValue("none");
       const options = select.locator("option");
-      await expect(options.first()).toHaveText("None");
-      await expect(options.last()).toHaveText("Custom");
+      await expect(options.first()).toHaveAttribute("value", "none");
+      await expect(options.last()).toHaveAttribute("value", "custom");
       expect(await options.count()).toBeGreaterThanOrEqual(3);
       // None is inert, so neither the DID input nor the warning shows.
       await expect(
diff --git a/tests/e2e/specs/views/settings/mutedWords.view.test.js b/tests/e2e/specs/views/settings/mutedWords.view.test.js
index f8f404a0..40411608 100644
--- a/tests/e2e/specs/views/settings/mutedWords.view.test.js
+++ b/tests/e2e/specs/views/settings/mutedWords.view.test.js
@@ -73,9 +73,13 @@ test.describe("Settings Muted Words view", () => {
 
     // List is reversed (newest first)
     await expect(items.nth(0)).toContainText("politics");
-    await expect(items.nth(0)).toContainText("in tags");
+    await expect(
+      items.nth(0).locator('[data-testid="muted-word-item-target"]'),
+    ).toHaveAttribute("data-teststate", "tags");
     await expect(items.nth(1)).toContainText("spoiler");
-    await expect(items.nth(1)).toContainText("in text & tags");
+    await expect(
+      items.nth(1).locator('[data-testid="muted-word-item-target"]'),
+    ).toHaveAttribute("data-teststate", "content-and-tags");
   });
 
   test("should add a muted word", async ({ page }) => {
@@ -193,9 +197,9 @@ test.describe("Settings Muted Words view", () => {
     const view = page.locator("#settings-muted-words-view");
     const item = view.locator('[data-testid="muted-word-item"]');
     await expect(item).toBeVisible({ timeout: 10000 });
-    await expect(item.locator(".muted-word-item-meta")).toContainText(
-      "Expires in",
-    );
+    await expect(
+      item.locator('[data-testid="muted-word-item-expiration"]'),
+    ).toHaveAttribute("data-teststate", "active");
   });
 
   test("should add a muted word with duration", async ({ page }) => {
@@ -219,9 +223,9 @@ test.describe("Settings Muted Words view", () => {
     const item = view.locator('[data-testid="muted-word-item"]');
     await expect(item).toHaveCount(1, { timeout: 10000 });
     await expect(item).toContainText("spoiler");
-    await expect(item.locator(".muted-word-item-meta")).toContainText(
-      "Expires in",
-    );
+    await expect(
+      item.locator('[data-testid="muted-word-item-expiration"]'),
+    ).toHaveAttribute("data-teststate", "active");
   });
 
   test("should add a muted word with tags-only target", async ({ page }) => {
@@ -245,7 +249,9 @@ test.describe("Settings Muted Words view", () => {
     const item = view.locator('[data-testid="muted-word-item"]');
     await expect(item).toHaveCount(1, { timeout: 10000 });
     await expect(item).toContainText("politics");
-    await expect(item).toContainText("in tags");
+    await expect(
+      item.locator('[data-testid="muted-word-item-target"]'),
+    ).toHaveAttribute("data-teststate", "tags");
   });
 
   test("should add a muted word with exclude-following", async ({ page }) => {
@@ -269,9 +275,9 @@ test.describe("Settings Muted Words view", () => {
     const item = view.locator('[data-testid="muted-word-item"]');
     await expect(item).toHaveCount(1, { timeout: 10000 });
     await expect(item).toContainText("discourse");
-    await expect(item.locator(".muted-word-item-meta")).toContainText(
-      "Excludes users you follow",
-    );
+    await expect(
+      item.locator('[data-testid="muted-word-item-exclude-following"]'),
+    ).toBeVisible();
   });
 
   test("should add a muted word with all options set", async ({ page }) => {
@@ -301,13 +307,15 @@ test.describe("Settings Muted Words view", () => {
     const item = view.locator('[data-testid="muted-word-item"]');
     await expect(item).toHaveCount(1, { timeout: 10000 });
     await expect(item).toContainText("drama");
-    await expect(item).toContainText("in tags");
-    await expect(item.locator(".muted-word-item-meta")).toContainText(
-      "Expires in",
-    );
-    await expect(item.locator(".muted-word-item-meta")).toContainText(
-      "Excludes users you follow",
-    );
+    await expect(
+      item.locator('[data-testid="muted-word-item-target"]'),
+    ).toHaveAttribute("data-teststate", "tags");
+    await expect(
+      item.locator('[data-testid="muted-word-item-expiration"]'),
+    ).toHaveAttribute("data-teststate", "active");
+    await expect(
+      item.locator('[data-testid="muted-word-item-exclude-following"]'),
+    ).toBeVisible();
   });
 
   test("should reset form options after adding a word", async ({ page }) => {
@@ -373,9 +381,9 @@ test.describe("Settings Muted Words view", () => {
     const view = page.locator("#settings-muted-words-view");
     const item = view.locator('[data-testid="muted-word-item"]');
     await expect(item).toBeVisible({ timeout: 10000 });
-    await expect(item.locator(".muted-word-item-meta")).toContainText(
-      "Excludes users you follow",
-    );
+    await expect(
+      item.locator('[data-testid="muted-word-item-exclude-following"]'),
+    ).toBeVisible();
   });
 
   test("should show renew button for expired muted words", async ({ page }) => {
@@ -398,9 +406,9 @@ test.describe("Settings Muted Words view", () => {
     const view = page.locator("#settings-muted-words-view");
     const item = view.locator('[data-testid="muted-word-item"]');
     await expect(item).toBeVisible({ timeout: 10000 });
-    await expect(item.locator(".muted-word-item-meta")).toContainText(
-      "Expired",
-    );
+    await expect(
+      item.locator('[data-testid="muted-word-item-expiration"]'),
+    ).toHaveAttribute("data-teststate", "expired");
     await expect(
       item.locator('[data-testid="muted-word-renew"]'),
     ).toBeVisible();
@@ -430,9 +438,9 @@ test.describe("Settings Muted Words view", () => {
     const view = page.locator("#settings-muted-words-view");
     const item = view.locator('[data-testid="muted-word-item"]');
     await expect(item).toBeVisible({ timeout: 10000 });
-    await expect(item.locator(".muted-word-item-meta")).toContainText(
-      "Expires in",
-    );
+    await expect(
+      item.locator('[data-testid="muted-word-item-expiration"]'),
+    ).toHaveAttribute("data-teststate", "active");
     await expect(
       item.locator('[data-testid="muted-word-renew"]'),
     ).not.toBeVisible();
@@ -468,9 +476,8 @@ test.describe("Settings Muted Words view", () => {
 
     await contextMenu.locator("context-menu-item").nth(1).click();
 
-    await expect(item.locator(".muted-word-item-meta")).toContainText(
-      "Expires in",
-      { timeout: 10000 },
-    );
+    await expect(
+      item.locator('[data-testid="muted-word-item-expiration"]'),
+    ).toHaveAttribute("data-teststate", "active", { timeout: 10000 });
   });
 });
diff --git a/tests/e2e/specs/views/starterPackDetail.view.test.js b/tests/e2e/specs/views/starterPackDetail.view.test.js
index 4338be7e..8137c024 100644
--- a/tests/e2e/specs/views/starterPackDetail.view.test.js
+++ b/tests/e2e/specs/views/starterPackDetail.view.test.js
@@ -355,7 +355,7 @@ test.describe("Starter Pack Detail view", () => {
 
       await expect(
         view.locator('[data-testid="starter-pack-creator"]'),
-      ).toContainText("by you");
+      ).toHaveAttribute("data-teststate", "self");
       await expect(
         view.locator('[data-testid="starter-pack-follow-all"]'),
       ).toHaveCount(0);
diff --git a/tests/unit/specs/components/edit-profile-dialog.test.js b/tests/unit/specs/components/edit-profile-dialog.test.js
index 8d355f9f..de7d053a 100644
--- a/tests/unit/specs/components/edit-profile-dialog.test.js
+++ b/tests/unit/specs/components/edit-profile-dialog.test.js
@@ -38,7 +38,6 @@ describe("edit-profile-dialog", () => {
       connectElement(element);
       const header = element.querySelector(".form-dialog-header h2");
       assert(header !== null, "Header should be rendered");
-      assert.deepEqual(header.textContent, "Edit profile");
     });
 
     it("should render display name input", () => {
@@ -73,9 +72,10 @@ describe("edit-profile-dialog", () => {
     it("should render cancel button", () => {
       const element = document.createElement("edit-profile-dialog");
       connectElement(element);
-      const cancelButton = element.querySelector(".form-dialog-header-button");
+      const cancelButton = element.querySelector(
+        "[data-testid='edit-profile-cancel-button']",
+      );
       assert(cancelButton !== null, "Cancel button should be rendered");
-      assert.deepEqual(cancelButton.textContent.trim(), "Cancel");
     });
   });
 
@@ -274,14 +274,8 @@ describe("edit-profile-dialog", () => {
       const menu = element.querySelector(".edit-profile-avatar-menu");
       const items = menu.querySelectorAll("context-menu-item");
       assert.deepEqual(items.length, 2);
-      assert(
-        items[0].textContent.includes("Upload from Files"),
-        "First item should be upload",
-      );
-      assert(
-        items[1].textContent.includes("Remove Avatar"),
-        "Second item should be remove",
-      );
+      assert.deepEqual(items[0].dataset.testid, "menu-action-avatar-upload");
+      assert.deepEqual(items[1].dataset.testid, "menu-action-avatar-remove");
     });
 
     it("should not include remove option when no avatar", () => {
@@ -292,10 +286,7 @@ describe("edit-profile-dialog", () => {
       const menu = element.querySelector(".edit-profile-avatar-menu");
       const items = menu.querySelectorAll("context-menu-item");
       assert.deepEqual(items.length, 1);
-      assert(
-        items[0].textContent.includes("Upload from Files"),
-        "Only upload option should exist",
-      );
+      assert.deepEqual(items[0].dataset.testid, "menu-action-avatar-upload");
     });
 
     it("should remove avatar when remove option clicked", () => {
diff --git a/tests/unit/specs/components/hidden-replies-section.test.js b/tests/unit/specs/components/hidden-replies-section.test.js
index 68d470aa..1d6b93fb 100644
--- a/tests/unit/specs/components/hidden-replies-section.test.js
+++ b/tests/unit/specs/components/hidden-replies-section.test.js
@@ -29,11 +29,11 @@ describe("hidden-replies-section", () => {
       assert(content !== null);
     });
 
-    it("should display 'Show more replies' text", () => {
+    it("should display the show more replies button", () => {
       const element = document.createElement("hidden-replies-section");
       document.body.appendChild(element);
       const button = element.querySelector(".hidden-replies-button");
-      assert(button.textContent.includes("Show more replies"));
+      assert(button !== null);
     });
 
     it("should preserve children in toggle-content", () => {
diff --git a/tests/unit/specs/components/image-alt-text-dialog.test.js b/tests/unit/specs/components/image-alt-text-dialog.test.js
index 48341a66..740246e1 100644
--- a/tests/unit/specs/components/image-alt-text-dialog.test.js
+++ b/tests/unit/specs/components/image-alt-text-dialog.test.js
@@ -28,7 +28,6 @@ describe("image-alt-text-dialog", () => {
       connectElement(element);
       const header = element.querySelector(".image-alt-text-dialog-header h2");
       assert(header !== null);
-      assert.deepEqual(header.textContent, "Add alt text");
     });
 
     it("should render textarea", () => {
diff --git a/tests/unit/specs/components/manage-list-members-dialog.test.js b/tests/unit/specs/components/manage-list-members-dialog.test.js
index 2d906f0a..a910bcf2 100644
--- a/tests/unit/specs/components/manage-list-members-dialog.test.js
+++ b/tests/unit/specs/components/manage-list-members-dialog.test.js
@@ -184,7 +184,7 @@ describe("manage-list-members-dialog", () => {
     const dialog = element.querySelector("dialog.manage-list-members-dialog");
     assert(dialog !== null);
     assert(dialog.classList.contains("bottom-sheet"));
-    assert(element.textContent.includes("Add people to list"));
+    assert(element.querySelector(".search-dialog-title") !== null);
     assert(
       element.querySelector(
         '[data-testid="manage-list-members-search-input"]',
@@ -224,7 +224,6 @@ describe("manage-list-members-dialog", () => {
     );
     assert.deepEqual(buttons.length, 1);
     assert.deepEqual(buttons[0].dataset.teststate, "not-member");
-    assert.equal(buttons[0].textContent.trim(), "Add");
   });
 
   it("shows Remove for a search result that is already a member", async () => {
@@ -241,7 +240,6 @@ describe("manage-list-members-dialog", () => {
     );
     assert.deepEqual(buttons.length, 1);
     assert.deepEqual(buttons[0].dataset.teststate, "member");
-    assert.equal(buttons[0].textContent.trim(), "Remove");
   });
 
   it("adds a profile when Add is clicked and flips the button to Remove", async () => {
@@ -261,7 +259,6 @@ describe("manage-list-members-dialog", () => {
       '[data-testid="manage-list-members-toggle"]',
     );
     assert.deepEqual(button.dataset.teststate, "member");
-    assert.equal(button.textContent.trim(), "Remove");
   });
 
   it("removes a profile when Remove is clicked and flips the button to Add", async () => {
@@ -283,7 +280,6 @@ describe("manage-list-members-dialog", () => {
       '[data-testid="manage-list-members-toggle"]',
     );
     assert.deepEqual(button.dataset.teststate, "not-member");
-    assert.equal(button.textContent.trim(), "Add");
   });
 
   it("shows a spinner and disables the button while a toggle is pending", async () => {
@@ -364,7 +360,6 @@ describe("manage-list-members-dialog", () => {
     await typeQuery(element, "zzz");
     const emptyMessage = element.querySelector('[data-testid="empty-state"]');
     assert(emptyMessage !== null);
-    assert.equal(emptyMessage.textContent.trim(), "No results");
   });
 
   it("closes on the close button", async () => {
diff --git a/tests/unit/specs/components/moderation-warning.test.js b/tests/unit/specs/components/moderation-warning.test.js
index 04a611bb..f6c6b069 100644
--- a/tests/unit/specs/components/moderation-warning.test.js
+++ b/tests/unit/specs/components/moderation-warning.test.js
@@ -35,7 +35,6 @@ describe("moderation-warning", () => {
       document.body.appendChild(element);
       const label = element.querySelector(".show-hide-label");
       assert(label !== null);
-      assert.deepEqual(label.textContent.trim(), "Show");
     });
 
     it("should preserve children in toggle-content", () => {
@@ -126,11 +125,11 @@ describe("moderation-warning", () => {
       assert(content.hidden);
     });
 
-    it("should display 'Show' label initially", () => {
+    it("should start collapsed", () => {
       const element = document.createElement("moderation-warning");
       document.body.appendChild(element);
-      const label = element.querySelector(".show-hide-label");
-      assert.deepEqual(label.textContent.trim(), "Show");
+      const topBar = element.querySelector(".top-bar");
+      assert.deepEqual(topBar.getAttribute("aria-expanded"), "false");
     });
   });
 
@@ -158,22 +157,14 @@ describe("moderation-warning", () => {
       assert(!content.hidden);
     });
 
-    it("should display 'Hide' label when expanded", () => {
-      const element = document.createElement("moderation-warning");
-      document.body.appendChild(element);
-      element.toggle();
-      const label = element.querySelector(".show-hide-label");
-      assert.deepEqual(label.textContent.trim(), "Hide");
-    });
-
     it("should toggle back to collapsed state", () => {
       const element = document.createElement("moderation-warning");
       document.body.appendChild(element);
       element.toggle();
       element.toggle();
       assert.deepEqual(element.expanded, false);
-      const label = element.querySelector(".show-hide-label");
-      assert.deepEqual(label.textContent.trim(), "Show");
+      const topBar = element.querySelector(".top-bar");
+      assert.deepEqual(topBar.getAttribute("aria-expanded"), "false");
     });
   });
 
diff --git a/tests/unit/specs/components/muted-parent-toggle.test.js b/tests/unit/specs/components/muted-parent-toggle.test.js
index 299522da..df3cd68d 100644
--- a/tests/unit/specs/components/muted-parent-toggle.test.js
+++ b/tests/unit/specs/components/muted-parent-toggle.test.js
@@ -29,11 +29,11 @@ describe("muted-parent-toggle", () => {
       assert(content !== null);
     });
 
-    it("should display default label 'Muted parent'", () => {
+    it("should display a default label", () => {
       const element = document.createElement("muted-parent-toggle");
       document.body.appendChild(element);
       const button = element.querySelector(".muted-parent-toggle-button");
-      assert(button.textContent.includes("Muted parent"));
+      assert.notDeepEqual(button.querySelector("span").textContent.trim(), "");
     });
 
     it("should display custom label when provided", () => {
@@ -44,12 +44,11 @@ describe("muted-parent-toggle", () => {
       assert(button.textContent.includes("Hidden by mute list"));
     });
 
-    it("should display 'Show' text", () => {
+    it("should display the show affordance", () => {
       const element = document.createElement("muted-parent-toggle");
       document.body.appendChild(element);
       const showMore = element.querySelector(".muted-account-show-more");
       assert(showMore !== null);
-      assert.deepEqual(showMore.textContent, "Show");
     });
 
     it("should preserve children in toggle-content", () => {
diff --git a/tests/unit/specs/components/new-chat-dialog.test.js b/tests/unit/specs/components/new-chat-dialog.test.js
index 3bae8917..0c4772e2 100644
--- a/tests/unit/specs/components/new-chat-dialog.test.js
+++ b/tests/unit/specs/components/new-chat-dialog.test.js
@@ -129,6 +129,12 @@ describe("new-chat-dialog", () => {
     return element;
   }
 
+  function resultsEmptyState(element, mode) {
+    return element.querySelector(
+      `[data-testid="new-chat-results"][data-teststate="${mode}"] [data-testid="empty-state"]`,
+    );
+  }
+
   function createApiError(errorName = "InternalError") {
     return new ApiError({
       status: 500,
@@ -198,11 +204,7 @@ describe("new-chat-dialog", () => {
       const { dataLayer } = makeDataLayer();
       seedFollows(dataLayer, []);
       const element = createDialog(dataLayer);
-      assert(
-        [...element.querySelectorAll('[data-testid="empty-state"]')].some(
-          (el) => el.textContent.includes("Search for someone to message"),
-        ),
-      );
+      assert(resultsEmptyState(element, "suggestions") !== null);
       assert.deepEqual(
         element.querySelector('[data-testid="profile-list-item-button"]'),
         null,
@@ -270,11 +272,7 @@ describe("new-chat-dialog", () => {
         }),
       ]);
       const element = createDialog(dataLayer);
-      assert(
-        [...element.querySelectorAll('[data-testid="empty-state"]')].some(
-          (el) => el.textContent.includes("Search for someone to message"),
-        ),
-      );
+      assert(resultsEmptyState(element, "suggestions") !== null);
       assert.deepEqual(
         element.querySelector('[data-testid="profile-list-item-button"]'),
         null,
@@ -288,11 +286,7 @@ describe("new-chat-dialog", () => {
       const element = createDialog(dataLayer);
       await flushMicrotasks();
       await nextFrame();
-      assert(
-        [...element.querySelectorAll('[data-testid="empty-state"]')].some(
-          (el) => el.textContent.includes("Search for someone to message"),
-        ),
-      );
+      assert(resultsEmptyState(element, "suggestions") !== null);
     });
 
     it("should fall back to the prompt when the follows request fails at the network level", async () => {
@@ -302,11 +296,7 @@ describe("new-chat-dialog", () => {
       const element = createDialog(dataLayer);
       await flushMicrotasks();
       await nextFrame();
-      assert(
-        [...element.querySelectorAll('[data-testid="empty-state"]')].some(
-          (el) => el.textContent.includes("Search for someone to message"),
-        ),
-      );
+      assert(resultsEmptyState(element, "suggestions") !== null);
       assert.deepEqual(element.querySelectorAll(".profile-skeleton").length, 0);
     });
 
@@ -379,11 +369,7 @@ describe("new-chat-dialog", () => {
         searchSpy.mock.calls[searchSpy.mock.calls.length - 1].arguments[0],
         "",
       );
-      assert(
-        [...element.querySelectorAll('[data-testid="empty-state"]')].some(
-          (el) => el.textContent.includes("Search for someone to message"),
-        ),
-      );
+      assert(resultsEmptyState(element, "suggestions") !== null);
       assert.deepEqual(
         element.querySelector('[data-testid="new-chat-search-clear"]'),
         null,
@@ -425,11 +411,7 @@ describe("new-chat-dialog", () => {
       const element = createDialog(dataLayer);
       seedSearchResults(dataLayer, []);
       await typeQuery(element, "alice");
-      assert(
-        [...element.querySelectorAll('[data-testid="empty-state"]')].some(
-          (el) => el.textContent.includes("No results"),
-        ),
-      );
+      assert(resultsEmptyState(element, "search") !== null);
     });
 
     it("should show an error row when the search fails with an ApiError", async () => {
@@ -533,7 +515,9 @@ describe("new-chat-dialog", () => {
       assert.deepEqual(rows[1].dataset.teststate, "disabled");
       assert.deepEqual(rows[1].disabled, true);
       assert(rows[1].textContent.includes("@carol.test"));
-      assert(rows[1].textContent.includes("Can't be messaged"));
+      assert(
+        rows[1].querySelector('[data-testid="not-messageable-hint"]') !== null,
+      );
     });
 
     it("should treat a missing allowIncoming declaration as following-only", async () => {
@@ -771,11 +755,6 @@ describe("new-chat-dialog", () => {
       assert(
         element.querySelector('[data-testid="new-group-back-button"]') !== null,
       );
-      assert(
-        element
-          .querySelector(".search-dialog-title")
-          .textContent.includes("New group chat"),
-      );
     });
 
     it("should fail open and advance while the actor status has not loaded", async () => {
@@ -806,7 +785,6 @@ describe("new-chat-dialog", () => {
       await nextFrame();
       const alert = document.body.querySelector('[data-testid="alert-modal"]');
       assert(alert !== null, "alert modal should be shown");
-      assert(alert.textContent.includes("Your account is too new"));
       assert.deepEqual(
         element.querySelector('[data-testid="new-group-back-button"]'),
         null,
diff --git a/tests/unit/specs/components/post-composer.test.js b/tests/unit/specs/components/post-composer.test.js
index eaf58f10..d8ca66d7 100644
--- a/tests/unit/specs/components/post-composer.test.js
+++ b/tests/unit/specs/components/post-composer.test.js
@@ -141,15 +141,17 @@ describe("post-composer", () => {
     });
   });
 
-  describe("PostComposer - button text", () => {
-    it("should show 'Post' for new posts", () => {
+  describe("PostComposer - submit button state", () => {
+    it("should use the post state for new posts", () => {
       const element = createPostComposer();
       connectElement(element);
-      const postButton = element.querySelector(".rounded-button-primary");
-      assert(postButton.textContent.includes("Post"));
+      const postButton = element.querySelector(
+        '[data-testid="composer-submit-button"]',
+      );
+      assert.deepEqual(postButton.dataset.teststate, "post");
     });
 
-    it("should show 'Reply' for replies", () => {
+    it("should use the reply state for replies", () => {
       const element = createPostComposer();
       element.replyTo = {
         author: { handle: "user.bsky.social", displayName: "User" },
@@ -157,8 +159,10 @@ describe("post-composer", () => {
         indexedAt: new Date().toISOString(),
       };
       connectElement(element);
-      const postButton = element.querySelector(".rounded-button-primary");
-      assert(postButton.textContent.includes("Reply"));
+      const postButton = element.querySelector(
+        '[data-testid="composer-submit-button"]',
+      );
+      assert.deepEqual(postButton.dataset.teststate, "reply");
     });
   });
 
@@ -541,7 +545,7 @@ describe("post-composer", () => {
       await nextFrame();
       const postButton = element.querySelector(".rounded-button-primary");
       assert(postButton.disabled);
-      assert.deepEqual(postButton.textContent.includes("Sending"), false);
+      assert.deepEqual(postButton.querySelector(".loading-spinner"), null);
 
       sendDetail.settledCallback();
       await nextFrame();
@@ -631,9 +635,6 @@ describe("post-composer", () => {
       assert.deepEqual(element.state.$isSending.get(), false);
       const banner = getBanner(element);
       assert(banner !== null);
-      assert(
-        banner.textContent.includes("Failed to send post. Please try again."),
-      );
     });
 
     it("does not render the banner before any failure", () => {
@@ -2410,7 +2411,6 @@ describe("post-composer", () => {
       const submitButton = element.querySelector(
         '[data-testid="composer-submit-button"]',
       );
-      assert(submitButton.textContent.includes("Post All"));
       assert.deepEqual(submitButton.dataset.teststate, "post-all");
       const postElements = element.querySelectorAll(
         '[data-testid="composer-post"]',
@@ -2654,6 +2654,10 @@ describe("post-composer", () => {
     return dataLayer;
   }
 
+  function getVideoOverlay(element) {
+    return element.querySelector('[data-testid="composer-video-overlay"]');
+  }
+
   describe("PostComposer - media preview actions", () => {
     let originalRevokeObjectURL;
     let revokedUrls;
@@ -2675,24 +2679,25 @@ describe("post-composer", () => {
         video: { previewUrl: "blob:x", status: "uploading", progress: 0 },
       });
       await nextFrame();
-      let overlay = element.querySelector(".video-preview-overlay");
-      assert(overlay.textContent.includes("Uploading..."));
+      let overlay = getVideoOverlay(element);
+      assert.deepEqual(overlay.dataset.teststate, "uploading");
       assert(overlay.querySelector(".loading-spinner") !== null);
 
       patchFirstPost(element, {
         video: { previewUrl: "blob:x", status: "processing", progress: 0 },
       });
       await nextFrame();
-      overlay = element.querySelector(".video-preview-overlay");
-      assert(overlay.textContent.includes("Processing..."));
+      overlay = getVideoOverlay(element);
+      assert.deepEqual(overlay.dataset.teststate, "processing");
       assert(!overlay.textContent.includes("%"));
 
       patchFirstPost(element, {
         video: { previewUrl: "blob:x", status: "processing", progress: 40 },
       });
       await nextFrame();
-      overlay = element.querySelector(".video-preview-overlay");
-      assert(overlay.textContent.includes("Processing... 40%"));
+      overlay = getVideoOverlay(element);
+      assert.deepEqual(overlay.dataset.teststate, "processing");
+      assert(overlay.textContent.includes("40%"));
     });
 
     it("shows the error overlay without a spinner and no overlay when done", async () => {
@@ -2702,7 +2707,8 @@ describe("post-composer", () => {
         video: { previewUrl: "blob:x", status: "error", error: "Too big" },
       });
       await nextFrame();
-      let overlay = element.querySelector(".video-preview-overlay");
+      let overlay = getVideoOverlay(element);
+      assert.deepEqual(overlay.dataset.teststate, "error");
       assert(overlay.textContent.includes("Too big"));
       assert.deepEqual(overlay.querySelector(".loading-spinner"), null);
 
@@ -2710,14 +2716,15 @@ describe("post-composer", () => {
         video: { previewUrl: "blob:x", status: "error", error: null },
       });
       await nextFrame();
-      overlay = element.querySelector(".video-preview-overlay");
-      assert(overlay.textContent.includes("Upload failed"));
+      overlay = getVideoOverlay(element);
+      assert.deepEqual(overlay.dataset.teststate, "error");
+      assert.notDeepEqual(overlay.textContent.trim(), "");
 
       patchFirstPost(element, {
         video: { previewUrl: "blob:x", status: "done" },
       });
       await nextFrame();
-      assert.deepEqual(element.querySelector(".video-preview-overlay"), null);
+      assert.deepEqual(getVideoOverlay(element), null);
     });
 
     it("removes the video via the preview remove button", async () => {
diff --git a/tests/unit/specs/modals/welcome.modal.test.js b/tests/unit/specs/modals/welcome.modal.test.js
index e88312b8..6f332830 100644
--- a/tests/unit/specs/modals/welcome.modal.test.js
+++ b/tests/unit/specs/modals/welcome.modal.test.js
@@ -12,15 +12,13 @@ describe("WelcomeModal", () => {
     const dialog = document.querySelector('[data-testid="welcome-modal"]');
     assert(dialog !== null);
     assert(dialog.hasAttribute("open"));
-    const title = document.querySelector('[data-testid="modal-title"]');
-    assert.deepEqual(title.textContent.trim(), "Welcome to Impro!");
+    assert(document.querySelector('[data-testid="modal-title"]') !== null);
   });
 
   it("should render a sign in link to the login page", () => {
     WelcomeModal.open();
     const link = document.querySelector('[data-testid="modal-primary-button"]');
     assert(link !== null);
-    assert.deepEqual(link.textContent.trim(), "Sign in");
     assert(link.getAttribute("href").startsWith("/login"));
     assert(link.hasAttribute("autofocus"));
   });
@@ -36,7 +34,6 @@ describe("WelcomeModal", () => {
     const exploreButton = document.querySelector(
       '[data-testid="modal-secondary-button"]',
     );
-    assert.deepEqual(exploreButton.textContent.trim(), "Explore");
     exploreButton.click();
     assert(document.querySelector('[data-testid="welcome-modal"]') === null);
   });
diff --git a/tests/unit/specs/modals/whoCanReply.modal.test.js b/tests/unit/specs/modals/whoCanReply.modal.test.js
index 3e78bc70..7f98e521 100644
--- a/tests/unit/specs/modals/whoCanReply.modal.test.js
+++ b/tests/unit/specs/modals/whoCanReply.modal.test.js
@@ -50,14 +50,14 @@ describe("WhoCanReplyModal", () => {
 
   it("should render everybody message when no threadgate", () => {
     WhoCanReplyModal.open({ post: everybodyPost });
-    const body = document.querySelector(".who-can-reply-body");
-    assert(body.textContent.includes("Everybody can reply to this post."));
+    const rule = document.querySelector('[data-testid="who-can-reply-rule"]');
+    assert.deepEqual(rule.dataset.teststate, "everybody");
   });
 
   it("should render nobody message when allow is empty", () => {
     WhoCanReplyModal.open({ post: nobodyPost });
-    const body = document.querySelector(".who-can-reply-body");
-    assert(body.textContent.includes("Replies to this post are disabled."));
+    const rule = document.querySelector('[data-testid="who-can-reply-rule"]');
+    assert.deepEqual(rule.dataset.teststate, "nobody");
   });
 
   it("should render followers rule", () => {
@@ -79,17 +79,19 @@ describe("WhoCanReplyModal", () => {
 
   it("should not show quote message when embedding is enabled", () => {
     WhoCanReplyModal.open({ post: everybodyPost });
-    const body = document.querySelector(".who-can-reply-body");
-    assert(!body.textContent.includes("quote this post"));
+    assert.deepEqual(
+      document.querySelector('[data-testid="who-can-reply-quote-disabled"]'),
+      null,
+    );
   });
 
   it("should show quote message when embedding is disabled", () => {
     WhoCanReplyModal.open({
       post: { ...everybodyPost, viewer: { embeddingDisabled: true } },
     });
-    const body = document.querySelector(".who-can-reply-body");
     assert(
-      body.textContent.includes("No one but the author can quote this post."),
+      document.querySelector('[data-testid="who-can-reply-quote-disabled"]') !==
+        null,
     );
   });
 
diff --git a/tests/unit/specs/templates/automatedAccountBadge.template.test.js b/tests/unit/specs/templates/automatedAccountBadge.template.test.js
index a1ee6e5d..4faac7c8 100644
--- a/tests/unit/specs/templates/automatedAccountBadge.template.test.js
+++ b/tests/unit/specs/templates/automatedAccountBadge.template.test.js
@@ -52,12 +52,6 @@ describe("automatedAccountBadgeTemplate", () => {
     badge.click();
     const dialog = document.querySelector('[data-testid="alert-modal"]');
     assert(dialog !== null);
-    assert(dialog.textContent.includes("Automated account"));
-    assert(
-      dialog.textContent.includes(
-        "This account has been marked as automated by its owner.",
-      ),
-    );
     dialog.close();
     dialog.remove();
   });
diff --git a/tests/unit/specs/templates/blockedPost.template.test.js b/tests/unit/specs/templates/blockedPost.template.test.js
index 4fd7b13e..7eef5d7c 100644
--- a/tests/unit/specs/templates/blockedPost.template.test.js
+++ b/tests/unit/specs/templates/blockedPost.template.test.js
@@ -4,13 +4,14 @@ import { blockedPostTemplate } from "/js/templates/blockedPost.template.js";
 import { render } from "/js/lib/lit-html.js";
 
 describe("blockedPostTemplate", () => {
-  it("should display 'Blocked' text", () => {
+  it("should render the blocked tombstone", () => {
     const result = blockedPostTemplate();
     const container = document.createElement("div");
     render(result, container);
-    const indicator = container.querySelector(".missing-post-indicator");
-    assert(indicator !== null);
-    assert(indicator.textContent.includes("Blocked"));
+    assert(
+      container.querySelector("[data-testid='post-tombstone-blocked']") !==
+        null,
+    );
   });
 
   it("should render an info icon", () => {
diff --git a/tests/unit/specs/templates/labelerSettings.template.test.js b/tests/unit/specs/templates/labelerSettings.template.test.js
index de772ff6..c2a30ab2 100644
--- a/tests/unit/specs/templates/labelerSettings.template.test.js
+++ b/tests/unit/specs/templates/labelerSettings.template.test.js
@@ -39,7 +39,7 @@ describe("labelerSettingsTemplate", () => {
       "[data-testid='labeler-settings-header']",
     );
     assert(header !== null);
-    assert(header.textContent.includes("Labels are annotations"));
+    assert.deepEqual(header.querySelector("[data-testid='empty-state']"), null);
   });
 
   it("should render label preference list", () => {
@@ -98,7 +98,11 @@ describe("labelerSettingsTemplate - no configurable labels", () => {
     });
     const container = document.createElement("div");
     render(result, container);
-    assert(container.textContent.includes("no configurable labels"));
+    assert(container.querySelector("[data-testid='empty-state']") !== null);
+    assert.deepEqual(
+      container.querySelector("[data-testid='label-preference-list']"),
+      null,
+    );
   });
 
   it("should not show label preference list when no configurable labels", () => {
diff --git a/tests/unit/specs/templates/largePost.template.test.js b/tests/unit/specs/templates/largePost.template.test.js
index 9eacfb17..c3edd029 100644
--- a/tests/unit/specs/templates/largePost.template.test.js
+++ b/tests/unit/specs/templates/largePost.template.test.js
@@ -272,7 +272,10 @@ describe("largePostTemplate - blocked/unavailable posts", () => {
     });
     const container = document.createElement("div");
     render(result, container);
-    assert(container.textContent.includes("Blocked"));
+    assert(
+      container.querySelector("[data-testid='post-tombstone-blocked']") !==
+        null,
+    );
   });
 
   it("should render not found post template for not found post", () => {
@@ -287,7 +290,10 @@ describe("largePostTemplate - blocked/unavailable posts", () => {
     });
     const container = document.createElement("div");
     render(result, container);
-    assert(container.textContent.includes("not found"));
+    assert(
+      container.querySelector("[data-testid='post-tombstone-not-found']") !==
+        null,
+    );
   });
 });
 
@@ -362,7 +368,7 @@ describe("largePostTemplate - who can reply badge", () => {
 
   it("opens the read-only modal for non-owners", () => {
     const badge = renderBadgeFor({ isUserPost: false });
-    assert.deepEqual(badge.getAttribute("data-teststate"), "plain");
+    assert(!badge.classList.contains("who-can-reply-badge-link"));
     badge.click();
     assert(
       document.querySelector("[data-testid='who-can-reply-modal']") !== null,
@@ -379,7 +385,7 @@ describe("largePostTemplate - who can reply badge", () => {
         },
       },
     });
-    assert.deepEqual(badge.getAttribute("data-teststate"), "link");
+    assert(badge.classList.contains("who-can-reply-badge-link"));
     badge.click();
     assert.deepEqual(editedPost, post);
     assert.deepEqual(
diff --git a/tests/unit/specs/templates/notFoundPost.template.test.js b/tests/unit/specs/templates/notFoundPost.template.test.js
index 3aa74842..26fded84 100644
--- a/tests/unit/specs/templates/notFoundPost.template.test.js
+++ b/tests/unit/specs/templates/notFoundPost.template.test.js
@@ -4,13 +4,14 @@ import { notFoundPostTemplate } from "/js/templates/notFoundPost.template.js";
 import { render } from "/js/lib/lit-html.js";
 
 describe("notFoundPostTemplate", () => {
-  it("should display 'Post not found' text", () => {
+  it("should render the not-found tombstone", () => {
     const result = notFoundPostTemplate();
     const container = document.createElement("div");
     render(result, container);
-    const indicator = container.querySelector(".missing-post-indicator");
-    assert(indicator !== null);
-    assert(indicator.textContent.includes("Post not found"));
+    assert(
+      container.querySelector("[data-testid='post-tombstone-not-found']") !==
+        null,
+    );
   });
 
   it("should render a trash can icon", () => {
diff --git a/tests/unit/specs/templates/postActionBar.template.test.js b/tests/unit/specs/templates/postActionBar.template.test.js
index 29841ab0..05249edb 100644
--- a/tests/unit/specs/templates/postActionBar.template.test.js
+++ b/tests/unit/specs/templates/postActionBar.template.test.js
@@ -200,7 +200,7 @@ describe("postActionBarTemplate", () => {
       "[data-testid='menu-action-quote-post']",
     );
     assert(quoteItem !== null);
-    assert.deepEqual(quoteItem.textContent.trim(), "Quote post");
+    assert.deepEqual(quoteItem.dataset.teststate, "quotable");
     assert(quoteItem.hasAttribute("disabled"));
   });
 
@@ -222,7 +222,7 @@ describe("postActionBarTemplate", () => {
       "[data-testid='menu-action-quote-post']",
     );
     assert(quoteItem !== null);
-    assert.deepEqual(quoteItem.textContent.trim(), "Quote posts disabled");
+    assert.deepEqual(quoteItem.dataset.teststate, "quotes-disabled");
     assert(quoteItem.hasAttribute("disabled"));
   });
 
@@ -240,7 +240,7 @@ describe("postActionBarTemplate", () => {
       "[data-testid='menu-action-quote-post']",
     );
     assert(quoteItem !== null);
-    assert.deepEqual(quoteItem.textContent.trim(), "Quote post");
+    assert.deepEqual(quoteItem.dataset.teststate, "quotable");
     assert(!quoteItem.hasAttribute("disabled"));
   });
 
diff --git a/tests/unit/specs/templates/postFeed.template.test.js b/tests/unit/specs/templates/postFeed.template.test.js
index 1d4430ea..3c8a808a 100644
--- a/tests/unit/specs/templates/postFeed.template.test.js
+++ b/tests/unit/specs/templates/postFeed.template.test.js
@@ -289,7 +289,6 @@ describe("postFeedTemplate - pagination", () => {
       "[data-testid='feed-end-message']",
     );
     assert(endMessage !== null);
-    assert(endMessage.textContent.includes("End of feed"));
   });
 
   it("should not show end of feed message by default when hasMore is false", () => {
diff --git a/tests/unit/specs/templates/profileList.template.test.js b/tests/unit/specs/templates/profileList.template.test.js
index 3a233b15..b70ff5ab 100644
--- a/tests/unit/specs/templates/profileList.template.test.js
+++ b/tests/unit/specs/templates/profileList.template.test.js
@@ -491,7 +491,6 @@ describe("profileListTemplate", () => {
     render(result, container);
     const msg = container.querySelector("[data-testid='feed-end-message']");
     assert(msg !== null);
-    assert(msg.textContent.includes("End of feed"));
   });
 
   it("should pass rightItemTemplate through to list items", () => {
diff --git a/tests/unit/specs/templates/sidebar.template.test.js b/tests/unit/specs/templates/sidebar.template.test.js
index 80bce61d..da31a919 100644
--- a/tests/unit/specs/templates/sidebar.template.test.js
+++ b/tests/unit/specs/templates/sidebar.template.test.js
@@ -26,7 +26,7 @@ describe("sidebarTemplate - logged out state", () => {
     );
   });
 
-  it("should render IMPRO title when logged out", () => {
+  it("should render the title when logged out", () => {
     const result = sidebarTemplate({
       isAuthenticated: false,
       currentUser: null,
@@ -35,7 +35,6 @@ describe("sidebarTemplate - logged out state", () => {
     render(result, container);
     const title = container.querySelector("h1");
     assert(title !== null);
-    assert(title.textContent.includes("IMPRO"));
   });
 
   it("should render sign in button when logged out", () => {
@@ -47,7 +46,6 @@ describe("sidebarTemplate - logged out state", () => {
     render(result, container);
     const loginButton = container.querySelector("[data-testid='login-button']");
     assert(loginButton !== null);
-    assert(loginButton.textContent.includes("Sign in"));
   });
 
   it("should render home nav item when logged out", () => {
@@ -179,12 +177,11 @@ describe("sidebarTemplate - logged in state", () => {
     });
     const container = document.createElement("div");
     render(result, container);
-    const stats = container.querySelector(
-      "[data-testid='sidebar-profile-stats']",
+    const followers = container.querySelector(
+      "[data-testid='sidebar-profile-followers']",
     );
-    assert(stats !== null);
-    assert(stats.textContent.includes("100"));
-    assert(stats.textContent.includes("followers"));
+    assert(followers !== null);
+    assert(followers.textContent.includes("100"));
   });
 
   it("should render following count", () => {
@@ -194,12 +191,11 @@ describe("sidebarTemplate - logged in state", () => {
     });
     const container = document.createElement("div");
     render(result, container);
-    const stats = container.querySelector(
-      "[data-testid='sidebar-profile-stats']",
+    const following = container.querySelector(
+      "[data-testid='sidebar-profile-following']",
     );
-    assert(stats !== null);
-    assert(stats.textContent.includes("50"));
-    assert(stats.textContent.includes("following"));
+    assert(following !== null);
+    assert(following.textContent.includes("50"));
   });
 
   it("should omit the stats row for a partial profile", () => {
diff --git a/tests/unit/specs/templates/smallPost.template.test.js b/tests/unit/specs/templates/smallPost.template.test.js
index c2daf225..347021e8 100644
--- a/tests/unit/specs/templates/smallPost.template.test.js
+++ b/tests/unit/specs/templates/smallPost.template.test.js
@@ -165,7 +165,6 @@ describe("smallPostTemplate - reposts", () => {
     render(result, container);
     const repostLabel = container.querySelector("[data-testid='repost-label']");
     assert(repostLabel !== null);
-    assert(repostLabel.textContent.includes("Reposted by"));
   });
 
   it("should show 'Reposted by you' when repostAuthor is the current user", () => {
@@ -346,7 +345,10 @@ describe("smallPostTemplate - blocked/unavailable posts", () => {
     });
     const container = document.createElement("div");
     render(result, container);
-    assert(container.textContent.includes("Blocked"));
+    assert(
+      container.querySelector("[data-testid='post-tombstone-blocked']") !==
+        null,
+    );
   });
 
   it("should render not found post template for not found post", () => {
@@ -361,7 +363,10 @@ describe("smallPostTemplate - blocked/unavailable posts", () => {
     });
     const container = document.createElement("div");
     render(result, container);
-    assert(container.textContent.includes("not found"));
+    assert(
+      container.querySelector("[data-testid='post-tombstone-not-found']") !==
+        null,
+    );
   });
 });
 
diff --git a/tests/unit/specs/templates/starterPackList.template.test.js b/tests/unit/specs/templates/starterPackList.template.test.js
index 81863a98..79f66a1a 100644
--- a/tests/unit/specs/templates/starterPackList.template.test.js
+++ b/tests/unit/specs/templates/starterPackList.template.test.js
@@ -88,7 +88,7 @@ describe("starterPackListTemplate", () => {
   it("shows the plain empty message without an empty template", () => {
     const container = renderList({ starterPacks: [] });
     const empty = container.querySelector("[data-testid='empty-state']");
-    assert(empty.textContent.includes("No starter packs yet."));
+    assert(empty !== null);
     assert.equal(empty.querySelector("button"), null);
   });
 });
diff --git a/tests/unit/specs/templates/unavailablePost.template.test.js b/tests/unit/specs/templates/unavailablePost.template.test.js
index 9a987520..a65238dc 100644
--- a/tests/unit/specs/templates/unavailablePost.template.test.js
+++ b/tests/unit/specs/templates/unavailablePost.template.test.js
@@ -4,13 +4,14 @@ import { unavailablePostTemplate } from "/js/templates/unavailablePost.template.
 import { render } from "/js/lib/lit-html.js";
 
 describe("unavailablePostTemplate", () => {
-  it("should display 'Post unavailable' text", () => {
+  it("should render the unavailable tombstone", () => {
     const result = unavailablePostTemplate();
     const container = document.createElement("div");
     render(result, container);
-    const indicator = container.querySelector(".missing-post-indicator");
-    assert(indicator !== null);
-    assert(indicator.textContent.includes("Post unavailable"));
+    assert(
+      container.querySelector("[data-testid='post-tombstone-unavailable']") !==
+        null,
+    );
   });
 
   it("should render an info icon", () => {
diff --git a/tests/unit/specs/templates/whoCanReplyBadge.template.test.js b/tests/unit/specs/templates/whoCanReplyBadge.template.test.js
index cfbab6bd..8f8893df 100644
--- a/tests/unit/specs/templates/whoCanReplyBadge.template.test.js
+++ b/tests/unit/specs/templates/whoCanReplyBadge.template.test.js
@@ -10,29 +10,29 @@ function renderBadge(post) {
 }
 
 describe("whoCanReplyBadgeTemplate", () => {
-  it("shows 'Everybody can reply' when post has no threadgate", () => {
+  it("marks the everybody reply setting when post has no threadgate", () => {
     const badge = renderBadge({});
     assert(badge !== null);
-    assert.deepEqual(badge.textContent.trim(), "Everybody can reply");
+    assert.deepEqual(badge.dataset.teststate, "everybody");
     assert(badge.querySelector("app-icon[icon='globe-grid-line']") !== null);
   });
 
-  it("shows 'Everybody can reply' when allow is undefined", () => {
+  it("marks the everybody reply setting when allow is undefined", () => {
     const post = { threadgate: { record: {} } };
     const badge = renderBadge(post);
     assert(badge !== null);
-    assert.deepEqual(badge.textContent.trim(), "Everybody can reply");
+    assert.deepEqual(badge.dataset.teststate, "everybody");
     assert(badge.querySelector("app-icon[icon='globe-grid-line']") !== null);
   });
 
-  it("shows 'Replies disabled' when allow is empty", () => {
+  it("marks the nobody reply setting when allow is empty", () => {
     const post = { threadgate: { record: { allow: [] } } };
     const badge = renderBadge(post);
     assert(badge !== null);
-    assert.deepEqual(badge.textContent.trim(), "Replies disabled");
+    assert.deepEqual(badge.dataset.teststate, "nobody");
   });
 
-  it("shows 'Some people can reply' for a mention rule", () => {
+  it("marks the limited reply setting for a mention rule", () => {
     const post = {
       threadgate: {
         record: {
@@ -42,10 +42,10 @@ describe("whoCanReplyBadgeTemplate", () => {
     };
     const badge = renderBadge(post);
     assert(badge !== null);
-    assert.deepEqual(badge.textContent.trim(), "Some people can reply");
+    assert.deepEqual(badge.dataset.teststate, "limited");
   });
 
-  it("shows 'Some people can reply' for multiple rules including a list", () => {
+  it("marks the limited reply setting for multiple rules including a list", () => {
     const post = {
       threadgate: {
         lists: [
@@ -67,20 +67,20 @@ describe("whoCanReplyBadgeTemplate", () => {
     };
     const badge = renderBadge(post);
     assert(badge !== null);
-    assert.deepEqual(badge.textContent.trim(), "Some people can reply");
+    assert.deepEqual(badge.dataset.teststate, "limited");
   });
 
-  it("shows 'Everybody can reply' when only embedding is disabled", () => {
+  it("marks the everybody reply setting when only embedding is disabled", () => {
     const post = { viewer: { embeddingDisabled: true } };
     const badge = renderBadge(post);
     assert(badge !== null);
-    assert.deepEqual(badge.textContent.trim(), "Everybody can reply");
+    assert.deepEqual(badge.dataset.teststate, "everybody");
   });
 
-  it("shows 'Everybody can reply' for everybody + embedding allowed", () => {
+  it("marks the everybody reply setting for everybody + embedding allowed", () => {
     const badge = renderBadge({ viewer: { embeddingDisabled: false } });
     assert(badge !== null);
-    assert.deepEqual(badge.textContent.trim(), "Everybody can reply");
+    assert.deepEqual(badge.dataset.teststate, "everybody");
   });
 
   it("exposes a data-testid for e2e tests", () => {
@@ -91,7 +91,7 @@ describe("whoCanReplyBadgeTemplate", () => {
 
   it("renders plain by default and as a link with linkStyle", () => {
     const badge = renderBadge({ author: { handle: "alice.test" } });
-    assert.deepEqual(badge.getAttribute("data-teststate"), "plain");
+    assert(!badge.classList.contains("who-can-reply-badge-link"));
 
     const container = document.createElement("div");
     render(
@@ -103,7 +103,7 @@ describe("whoCanReplyBadgeTemplate", () => {
       container,
     );
     const linkBadge = container.querySelector(".who-can-reply-badge");
-    assert.deepEqual(linkBadge.getAttribute("data-teststate"), "link");
+    assert(linkBadge.classList.contains("who-can-reply-badge-link"));
   });
 
   it("invokes onClick with the post when clicked", () => {