diff --git a/src/renderer/components/Sidebar.test.tsx b/src/renderer/components/Sidebar.test.tsx
index 4b89e30db..4be7f15ba 100644
--- a/src/renderer/components/Sidebar.test.tsx
+++ b/src/renderer/components/Sidebar.test.tsx
@@ -76,15 +76,15 @@ describe('renderer/components/Sidebar.tsx', () => {
       accounts: [],
     });
 
-    expect(screen.queryByTestId('sidebar-notifications')).not.toBeInTheDocument();
-    expect(screen.queryByTestId('sidebar-my-issues')).not.toBeInTheDocument();
-    expect(screen.queryByTestId('sidebar-my-pull-requests')).not.toBeInTheDocument();
+    expect(screen.queryByRole('button', { name: /^Notifications/ })).not.toBeInTheDocument();
+    expect(screen.queryByRole('button', { name: /^My issues/ })).not.toBeInTheDocument();
+    expect(screen.queryByRole('button', { name: /^My pull requests/ })).not.toBeInTheDocument();
   });
 
   it('navigates home when clicking logo', async () => {
     renderWithProviders(<Sidebar />);
 
-    await userEvent.click(screen.getByTestId('sidebar-home'));
+    await userEvent.click(screen.getByRole('button', { name: new RegExp(`^${APPLICATION.NAME}`) }));
 
     expect(navigateMock).toHaveBeenCalledTimes(1);
     expect(navigateMock).toHaveBeenCalledWith('/', { replace: true });
@@ -96,7 +96,7 @@ describe('renderer/components/Sidebar.tsx', () => {
         accounts: [mockGitHubCloudAccount],
       });
 
-      await userEvent.click(screen.getByTestId('sidebar-notifications'));
+      await userEvent.click(screen.getByRole('button', { name: /^Notifications/ }));
 
       expect(openExternalLinkSpy).toHaveBeenCalledTimes(1);
       expect(openExternalLinkSpy).toHaveBeenCalledWith('https://github.com/notifications');
@@ -134,7 +134,7 @@ describe('renderer/components/Sidebar.tsx', () => {
         settings: { ...mockSettings, participating: false },
       });
 
-      expect(screen.getByTestId('sidebar-focused-mode')).toHaveAttribute(
+      expect(screen.getByRole('button', { name: /^Toggle focused mode/ })).toHaveAttribute(
         'data-variant',
         'invisible',
       );
@@ -146,7 +146,10 @@ describe('renderer/components/Sidebar.tsx', () => {
         settings: { ...mockSettings, participating: true },
       });
 
-      expect(screen.getByTestId('sidebar-focused-mode')).toHaveAttribute('data-variant', 'primary');
+      expect(screen.getByRole('button', { name: /^Toggle focused mode/ })).toHaveAttribute(
+        'data-variant',
+        'primary',
+      );
     });
 
     it('toggles participating when clicked', async () => {
@@ -156,7 +159,7 @@ describe('renderer/components/Sidebar.tsx', () => {
         fetchNotifications: fetchNotificationsMock,
       });
 
-      await userEvent.click(screen.getByTestId('sidebar-focused-mode'));
+      await userEvent.click(screen.getByRole('button', { name: /^Toggle focused mode/ }));
 
       expect(updateSettingSpy).toHaveBeenCalledTimes(1);
       expect(updateSettingSpy).toHaveBeenCalledWith('participating', true);
@@ -169,7 +172,7 @@ describe('renderer/components/Sidebar.tsx', () => {
         accounts: [mockGitHubCloudAccount],
       });
 
-      await userEvent.click(screen.getByTestId('sidebar-filter-notifications'));
+      await userEvent.click(screen.getByRole('button', { name: /^Filters/ }));
 
       expect(navigateMock).toHaveBeenCalledTimes(1);
       expect(navigateMock).toHaveBeenCalledWith('/filters');
@@ -181,7 +184,7 @@ describe('renderer/components/Sidebar.tsx', () => {
         accounts: [mockGitHubCloudAccount],
       });
 
-      await userEvent.click(screen.getByTestId('sidebar-filter-notifications'));
+      await userEvent.click(screen.getByRole('button', { name: /^Filters/ }));
 
       expect(navigateMock).toHaveBeenCalledTimes(1);
       expect(navigateMock).toHaveBeenCalledWith('/', { replace: true });
@@ -194,7 +197,7 @@ describe('renderer/components/Sidebar.tsx', () => {
         filters: { reasons: ['assign'] },
       });
 
-      expect(screen.getByTestId('sidebar-filter-notifications')).toHaveAttribute(
+      expect(screen.getByRole('button', { name: /^Filters/ })).toHaveAttribute(
         'data-variant',
         'primary',
       );
@@ -207,7 +210,7 @@ describe('renderer/components/Sidebar.tsx', () => {
         accounts: [mockGitHubCloudAccount],
       });
 
-      await userEvent.click(screen.getByTestId('sidebar-my-issues'));
+      await userEvent.click(screen.getByRole('button', { name: /^My issues/ }));
 
       expect(openExternalLinkSpy).toHaveBeenCalledTimes(1);
       expect(openExternalLinkSpy).toHaveBeenCalledWith('https://github.com/issues');
@@ -218,7 +221,7 @@ describe('renderer/components/Sidebar.tsx', () => {
         accounts: [mockGitHubCloudAccount],
       });
 
-      await userEvent.click(screen.getByTestId('sidebar-my-pull-requests'));
+      await userEvent.click(screen.getByRole('button', { name: /^My pull requests/ }));
 
       expect(openExternalLinkSpy).toHaveBeenCalledTimes(1);
       expect(openExternalLinkSpy).toHaveBeenCalledWith('https://github.com/pulls');
@@ -233,7 +236,7 @@ describe('renderer/components/Sidebar.tsx', () => {
         status: 'success',
       });
 
-      await userEvent.click(screen.getByTestId('sidebar-refresh'));
+      await userEvent.click(screen.getByRole('button', { name: /^Refresh/ }));
 
       expect(fetchNotificationsMock).toHaveBeenCalledTimes(1);
     });
@@ -245,7 +248,7 @@ describe('renderer/components/Sidebar.tsx', () => {
         status: 'loading',
       });
 
-      await userEvent.click(screen.getByTestId('sidebar-refresh'));
+      await userEvent.click(screen.getByRole('button', { name: /^Refresh/ }));
 
       expect(fetchNotificationsMock).not.toHaveBeenCalled();
     });
@@ -256,8 +259,11 @@ describe('renderer/components/Sidebar.tsx', () => {
         status: 'loading',
       });
 
-      expect(screen.getByTestId('sidebar-refresh')).toHaveAttribute('data-loading', 'true');
-      expect(screen.getByTestId('sidebar-refresh')).toBeDisabled();
+      expect(screen.getByRole('button', { name: /^Refresh/ })).toHaveAttribute(
+        'data-loading',
+        'true',
+      );
+      expect(screen.getByRole('button', { name: /^Refresh/ })).toBeDisabled();
     });
 
     it('shows a loading spinner on the refresh icon while a background fetch is in flight, regardless of settled status', () => {
@@ -267,9 +273,12 @@ describe('renderer/components/Sidebar.tsx', () => {
         isFetching: true,
       });
 
-      expect(screen.getByTestId('sidebar-refresh')).toHaveAttribute('data-loading', 'true');
+      expect(screen.getByRole('button', { name: /^Refresh/ })).toHaveAttribute(
+        'data-loading',
+        'true',
+      );
       expect(tree.container.querySelector('[data-component="Spinner"]')).toBeInTheDocument();
-      expect(screen.getByTestId('sidebar-refresh')).toBeDisabled();
+      expect(screen.getByRole('button', { name: /^Refresh/ })).toBeDisabled();
     });
 
     it('does not show a loading spinner on the refresh icon when settled and no fetch is in flight', () => {
@@ -279,8 +288,11 @@ describe('renderer/components/Sidebar.tsx', () => {
         isFetching: false,
       });
 
-      expect(screen.getByTestId('sidebar-refresh')).toHaveAttribute('data-loading', 'false');
-      expect(screen.getByTestId('sidebar-refresh')).toBeEnabled();
+      expect(screen.getByRole('button', { name: /^Refresh/ })).toHaveAttribute(
+        'data-loading',
+        'false',
+      );
+      expect(screen.getByRole('button', { name: /^Refresh/ })).toBeEnabled();
     });
   });
 
@@ -290,7 +302,7 @@ describe('renderer/components/Sidebar.tsx', () => {
         accounts: [mockGitHubCloudAccount],
       });
 
-      await userEvent.click(screen.getByTestId('sidebar-settings'));
+      await userEvent.click(screen.getByRole('button', { name: /^Settings/ }));
 
       expect(navigateMock).toHaveBeenCalledTimes(1);
       expect(navigateMock).toHaveBeenCalledWith('/settings');
@@ -303,7 +315,7 @@ describe('renderer/components/Sidebar.tsx', () => {
         fetchNotifications: fetchNotificationsMock,
       });
 
-      await userEvent.click(screen.getByTestId('sidebar-settings'));
+      await userEvent.click(screen.getByRole('button', { name: /^Settings/ }));
 
       expect(fetchNotificationsMock).toHaveBeenCalledTimes(1);
       expect(navigateMock).toHaveBeenCalledTimes(1);
@@ -318,7 +330,9 @@ describe('renderer/components/Sidebar.tsx', () => {
       accounts: [],
     });
 
-    await userEvent.click(screen.getByTestId('sidebar-quit'));
+    await userEvent.click(
+      screen.getByRole('button', { name: new RegExp(`^Quit ${APPLICATION.NAME}`) }),
+    );
 
     expect(quitAppSpy).toHaveBeenCalledTimes(1);
   });
diff --git a/src/renderer/components/Sidebar.tsx b/src/renderer/components/Sidebar.tsx
index 30b0d04e3..ee784fb77 100644
--- a/src/renderer/components/Sidebar.tsx
+++ b/src/renderer/components/Sidebar.tsx
@@ -42,7 +42,6 @@ export function Sidebar() {
       <Stack align="center" direction="vertical" gap="condensed" padding="normal">
         <IconButton
           aria-label={APPLICATION.NAME}
-          data-testid="sidebar-home"
           description="Home"
           icon={<LogoIcon />}
           keybindingHint={shortcuts.home.key}
@@ -56,7 +55,6 @@ export function Sidebar() {
           <>
             <IconButton
               aria-label="Notifications"
-              data-testid="sidebar-notifications"
               description={`${notificationCount} ${fetchReadNotifications ? 'notifications' : 'unread notifications'} ↗`}
               icon={BellIcon}
               keybindingHint={shortcuts.myNotifications.key}
@@ -68,7 +66,6 @@ export function Sidebar() {
 
             <IconButton
               aria-label="Toggle focused mode"
-              data-testid="sidebar-focused-mode"
               description={
                 participating ? 'Focused (participating only)' : 'Participating and watching'
               }
@@ -82,7 +79,6 @@ export function Sidebar() {
 
             <IconButton
               aria-label="Filters"
-              data-testid="sidebar-filter-notifications"
               description="Filter notifications"
               icon={FilterIcon}
               keybindingHint={shortcuts.filters.key}
@@ -94,7 +90,6 @@ export function Sidebar() {
 
             <IconButton
               aria-label="My issues ↗"
-              data-testid="sidebar-my-issues"
               icon={IssueOpenedIcon}
               keybindingHint={shortcuts.myIssues.key}
               onClick={() => shortcuts.myIssues.action()}
@@ -105,7 +100,6 @@ export function Sidebar() {
 
             <IconButton
               aria-label="My pull requests ↗"
-              data-testid="sidebar-my-pull-requests"
               icon={GitPullRequestIcon}
               keybindingHint={shortcuts.myPullRequests.key}
               onClick={() => shortcuts.myPullRequests.action()}
@@ -122,7 +116,6 @@ export function Sidebar() {
           <>
             <IconButton
               aria-label="Refresh"
-              data-testid="sidebar-refresh"
               description="Refresh notifications"
               loading={isLoading || isFetching}
               disabled={isLoading || isFetching}
@@ -136,7 +129,6 @@ export function Sidebar() {
 
             <IconButton
               aria-label="Settings"
-              data-testid="sidebar-settings"
               description="Settings"
               icon={GearIcon}
               keybindingHint={shortcuts.settings.key}
@@ -151,7 +143,6 @@ export function Sidebar() {
         {!isLoggedIn && (
           <IconButton
             aria-label={`Quit ${APPLICATION.NAME}`}
-            data-testid="sidebar-quit"
             icon={XCircleIcon}
             keybindingHint={shortcuts.quit.key}
             onClick={() => shortcuts.quit.action()}
diff --git a/src/renderer/components/filters/FilterCheckbox.test.tsx b/src/renderer/components/filters/FilterCheckbox.test.tsx
index fedf0c5be..02fe144ea 100644
--- a/src/renderer/components/filters/FilterCheckbox.test.tsx
+++ b/src/renderer/components/filters/FilterCheckbox.test.tsx
@@ -11,7 +11,7 @@ describe('renderer/components/filters/FilterCheckbox.tsx', () => {
       <FilterCheckbox checked={true} counter={3} label="Issues" name="issues" onChange={vi.fn()} />,
     );
 
-    expect(screen.getByTestId('checkbox-issues')).toBeChecked();
+    expect(screen.getByRole('checkbox', { name: 'Issues' })).toBeChecked();
     expect(screen.getByText('Issues')).toBeInTheDocument();
     expect(screen.getByText('3')).toBeInTheDocument();
   });
@@ -28,7 +28,7 @@ describe('renderer/components/filters/FilterCheckbox.tsx', () => {
       />,
     );
 
-    expect(screen.getByTestId('checkbox-issues')).toBeDisabled();
+    expect(screen.getByRole('checkbox', { name: 'Issues' })).toBeDisabled();
 
     await userEvent.click(screen.getByTestId('tooltip-icon-tooltip-issues'));
 
diff --git a/src/renderer/components/layout/AppLayout.tsx b/src/renderer/components/layout/AppLayout.tsx
index d1001acc2..bd9059a92 100644
--- a/src/renderer/components/layout/AppLayout.tsx
+++ b/src/renderer/components/layout/AppLayout.tsx
@@ -20,13 +20,7 @@ export function AppLayout({ children }: Readonly<AppLayoutProps>) {
   return (
     <div className="flex flex-col min-h-screen bg-gitify-background">
       {/* Hidden focus sentinel; grabs initial focus via callback ref */}
-      <button
-        aria-label="initial focus"
-        className="sr-only"
-        data-testid="initial-focus-sentinel"
-        ref={setFocusRef}
-        type="button"
-      />
+      <button aria-label="initial focus" className="sr-only" ref={setFocusRef} type="button" />
 
       <Sidebar />
 
diff --git a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
index f44551b05..794b5b692 100644
--- a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
+++ b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
@@ -9,7 +9,6 @@ exports[`renderer/components/layout/AppLayout.tsx > renders itself & its childre
       aria-label="initial focus"
       class="sr-only focus-visible"
       data-focus-visible-added=""
-      data-testid="initial-focus-sentinel"
       type="button"
     />
     <div
@@ -39,7 +38,6 @@ exports[`renderer/components/layout/AppLayout.tsx > renders itself & its childre
           data-loading="false"
           data-no-visuals="true"
           data-size="small"
-          data-testid="sidebar-home"
           data-variant="invisible"
           type="button"
         >
@@ -156,7 +154,6 @@ exports[`renderer/components/layout/AppLayout.tsx > renders itself & its childre
           data-loading="false"
           data-no-visuals="true"
           data-size="small"
-          data-testid="sidebar-quit"
           data-variant="invisible"
           type="button"
         >
diff --git a/src/renderer/components/login/LoginWithPersonalAccessTokenForm.tsx b/src/renderer/components/login/LoginWithPersonalAccessTokenForm.tsx
index fd2b04a25..c089fcaff 100644
--- a/src/renderer/components/login/LoginWithPersonalAccessTokenForm.tsx
+++ b/src/renderer/components/login/LoginWithPersonalAccessTokenForm.tsx
@@ -171,7 +171,6 @@ export function LoginWithPersonalAccessTokenForm({
               <TextInput
                 aria-invalid={errors.username ? 'true' : 'false'}
                 block
-                data-testid="login-username"
                 name="username"
                 onChange={handleInputChange}
                 placeholder={usernamePlaceholder}
@@ -254,7 +253,6 @@ export function LoginWithPersonalAccessTokenForm({
       <Footer justify="space-between">
         <Tooltip direction="ne" text={docsTooltip}>
           <Button
-            data-testid="login-docs"
             leadingVisual={BookIcon}
             onClick={() => openExternalLink(adapter.documentationUrl)}
             size="small"
diff --git a/src/renderer/components/notifications/NotificationRow.test.tsx b/src/renderer/components/notifications/NotificationRow.test.tsx
index 0e13a34f3..d17eecf66 100644
--- a/src/renderer/components/notifications/NotificationRow.test.tsx
+++ b/src/renderer/components/notifications/NotificationRow.test.tsx
@@ -243,7 +243,7 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
         markNotificationsAsRead: markNotificationsAsReadMock,
       });
 
-      await userEvent.click(screen.getByTestId('notification-mark-as-read'));
+      await userEvent.click(screen.getByRole('button', { name: 'Mark as read' }));
 
       expect(markNotificationsAsReadMock).toHaveBeenCalledTimes(1);
     });
@@ -259,7 +259,7 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
 
       renderWithProviders(<NotificationRow {...props} />);
 
-      expect(screen.queryByTestId('notification-mark-as-read')).not.toBeInTheDocument();
+      expect(screen.queryByRole('button', { name: 'Mark as read' })).not.toBeInTheDocument();
     });
 
     it('marks notifications as done', async () => {
@@ -275,7 +275,7 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
         markNotificationsAsDone: markNotificationsAsDoneMock,
       });
 
-      await userEvent.click(screen.getByTestId('notification-mark-as-done'));
+      await userEvent.click(screen.getByRole('button', { name: 'Mark as done' }));
 
       expect(markNotificationsAsDoneMock).toHaveBeenCalledTimes(1);
     });
@@ -291,7 +291,7 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
 
       renderWithProviders(<NotificationRow {...props} />);
 
-      expect(screen.queryByTestId('notification-mark-as-done')).not.toBeInTheDocument();
+      expect(screen.queryByRole('button', { name: 'Mark as done' })).not.toBeInTheDocument();
     });
 
     it('shows mark as done button when fetchReadNotifications is enabled and notification is unread', async () => {
@@ -304,8 +304,8 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
         settings: { ...mockSettings, fetchReadNotifications: true },
       });
 
-      expect(screen.getByTestId('notification-mark-as-done')).toBeInTheDocument();
-      expect(screen.getByTestId('notification-mark-as-read')).toBeInTheDocument();
+      expect(screen.getByRole('button', { name: 'Mark as done' })).toBeInTheDocument();
+      expect(screen.getByRole('button', { name: 'Mark as read' })).toBeInTheDocument();
     });
 
     it('unsubscribes from a notification thread', async () => {
@@ -320,7 +320,7 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
         unsubscribeNotification: unsubscribeNotificationMock,
       });
 
-      await userEvent.click(screen.getByTestId('notification-unsubscribe-from-thread'));
+      await userEvent.click(screen.getByRole('button', { name: 'Unsubscribe from thread' }));
 
       expect(unsubscribeNotificationMock).toHaveBeenCalledTimes(1);
     });
@@ -333,7 +333,9 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
 
       renderWithProviders(<NotificationRow {...props} />);
 
-      expect(screen.queryByTestId('notification-unsubscribe-from-thread')).not.toBeInTheDocument();
+      expect(
+        screen.queryByRole('button', { name: 'Unsubscribe from thread' }),
+      ).not.toBeInTheDocument();
     });
   });
 
@@ -365,7 +367,7 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
 
       renderWithProviders(<NotificationRow {...props} />);
 
-      expect(screen.getByTestId('notification-mark-as-read')).toHaveAttribute(
+      expect(screen.getByRole('button', { name: 'Mark as read' })).toHaveAttribute(
         'title',
         'Mark as read',
       );
@@ -381,9 +383,9 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
         markNotificationsAsRead: vi.fn().mockResolvedValue(false),
       });
 
-      await userEvent.click(screen.getByTestId('notification-mark-as-read'));
+      await userEvent.click(screen.getByRole('button', { name: 'Mark as read' }));
 
-      expect(screen.getByTestId('notification-mark-as-read')).toBeInTheDocument();
+      expect(screen.getByRole('button', { name: 'Mark as read' })).toBeInTheDocument();
     });
 
     it('styles and explains only the action that failed', () => {
@@ -407,11 +409,11 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
         'title',
         expect.stringContaining('You can also try opening this notification in your browser.'),
       );
-      expect(screen.getByTestId('notification-mark-as-done')).toHaveAttribute(
+      expect(screen.getByRole('button', { name: 'Mark as done' })).toHaveAttribute(
         'title',
         'Mark as done',
       );
-      expect(screen.getByTestId('notification-unsubscribe-from-thread')).toHaveAttribute(
+      expect(screen.getByRole('button', { name: 'Unsubscribe from thread' })).toHaveAttribute(
         'title',
         'Unsubscribe from thread',
       );
diff --git a/src/renderer/components/primitives/Header.test.tsx b/src/renderer/components/primitives/Header.test.tsx
index f2fd19488..0d6d85f72 100644
--- a/src/renderer/components/primitives/Header.test.tsx
+++ b/src/renderer/components/primitives/Header.test.tsx
@@ -19,7 +19,7 @@ describe('renderer/components/primitives/Header.tsx', () => {
   it('navigates back', async () => {
     renderWithProviders(<Header icon={MarkGithubIcon}>Test Header</Header>);
 
-    await userEvent.click(screen.getByTestId('header-nav-back'));
+    await userEvent.click(screen.getByRole('button', { name: 'Go back' }));
 
     expect(navigateMock).toHaveBeenCalledTimes(1);
     expect(navigateMock).toHaveBeenCalledWith(-1);
@@ -33,7 +33,7 @@ describe('renderer/components/primitives/Header.tsx', () => {
       { fetchNotifications: fetchNotificationsMock },
     );
 
-    await userEvent.click(screen.getByTestId('header-nav-back'));
+    await userEvent.click(screen.getByRole('button', { name: 'Go back' }));
 
     expect(fetchNotificationsMock).toHaveBeenCalledTimes(1);
     expect(navigateMock).toHaveBeenCalledTimes(1);
diff --git a/src/renderer/components/primitives/Header.tsx b/src/renderer/components/primitives/Header.tsx
index 9f9446438..14ecb5f47 100644
--- a/src/renderer/components/primitives/Header.tsx
+++ b/src/renderer/components/primitives/Header.tsx
@@ -22,8 +22,7 @@ export function Header(props: Readonly<HeaderProps>) {
     <div className="pl-4 pr-5 pt-3 pb-1">
       <Stack direction="horizontal" justify="space-between">
         <IconButton
-          aria-labelledby="Go Back"
-          data-testid="header-nav-back"
+          aria-label="Go back"
           icon={ArrowLeftIcon}
           onClick={() => {
             void navigate(-1);
diff --git a/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
index 5cb848f07..d135d27f7 100644
--- a/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
@@ -15,13 +15,12 @@ exports[`renderer/components/primitives/Header.tsx > renders itself & its childr
       data-wrap="nowrap"
     >
       <button
-        aria-labelledby="Go Back"
+        aria-labelledby="_r_0_"
         class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
         data-component="IconButton"
         data-loading="false"
         data-no-visuals="true"
         data-size="medium"
-        data-testid="header-nav-back"
         data-variant="invisible"
         type="button"
       >
@@ -43,6 +42,16 @@ exports[`renderer/components/primitives/Header.tsx > renders itself & its childr
           />
         </svg>
       </button>
+      <span
+        aria-hidden="true"
+        class="prc-TooltipV2-Tooltip-tLeuB"
+        data-component="Tooltip"
+        data-direction="e"
+        id="_r_0_"
+        popover="auto"
+      >
+        Go back
+      </span>
       <div
         class="mb-2"
       >
diff --git a/src/renderer/components/settings/AlertSettings.tsx b/src/renderer/components/settings/AlertSettings.tsx
index 4b725b10d..2ce84593a 100644
--- a/src/renderer/components/settings/AlertSettings.tsx
+++ b/src/renderer/components/settings/AlertSettings.tsx
@@ -63,7 +63,6 @@ export function AlertSettings() {
             <ButtonGroup data-testid="settings-volume-group">
               <IconButton
                 aria-label="Volume down"
-                data-testid="settings-volume-down"
                 disabled={!canDecreaseVolume(notificationVolume)}
                 icon={VolumeDownIcon}
                 onClick={() => {
@@ -84,7 +83,6 @@ export function AlertSettings() {
 
               <IconButton
                 aria-label="Volume up"
-                data-testid="settings-volume-up"
                 disabled={!canIncreaseVolume(notificationVolume)}
                 icon={VolumeUpIcon}
                 onClick={() => {
@@ -96,7 +94,6 @@ export function AlertSettings() {
 
               <IconButton
                 aria-label="Reset volume"
-                data-testid="settings-volume-reset"
                 icon={SyncIcon}
                 onClick={() => {
                   updateSetting('notificationVolume', defaultSettings.notificationVolume);
diff --git a/src/renderer/components/settings/AppearanceSettings.tsx b/src/renderer/components/settings/AppearanceSettings.tsx
index 31ac68187..4995a215a 100644
--- a/src/renderer/components/settings/AppearanceSettings.tsx
+++ b/src/renderer/components/settings/AppearanceSettings.tsx
@@ -118,7 +118,6 @@ export function AppearanceSettings() {
           <ButtonGroup>
             <IconButton
               aria-label="Zoom out"
-              data-testid="settings-zoom-out"
               disabled={!canDecreaseZoom(zoomPercentage)}
               icon={ZoomOutIcon}
               onClick={() => decreaseZoom(zoomPercentage)}
@@ -137,7 +136,6 @@ export function AppearanceSettings() {
 
             <IconButton
               aria-label="Zoom in"
-              data-testid="settings-zoom-in"
               disabled={!canIncreaseZoom(zoomPercentage)}
               icon={ZoomInIcon}
               onClick={() => increaseZoom(zoomPercentage)}
@@ -147,7 +145,6 @@ export function AppearanceSettings() {
 
             <IconButton
               aria-label="Reset zoom"
-              data-testid="settings-zoom-reset"
               icon={SyncIcon}
               onClick={() => resetZoomLevel()}
               size="small"
diff --git a/src/renderer/components/settings/InboxSettings.tsx b/src/renderer/components/settings/InboxSettings.tsx
index d651e07d6..8235ce5d7 100644
--- a/src/renderer/components/settings/InboxSettings.tsx
+++ b/src/renderer/components/settings/InboxSettings.tsx
@@ -88,7 +88,6 @@ export function InboxSettings() {
             <ButtonGroup>
               <IconButton
                 aria-label="Decrease fetch interval"
-                data-testid="settings-fetch-interval-decrease"
                 icon={DashIcon}
                 onClick={() => {
                   const newInterval = Math.max(
@@ -117,7 +116,6 @@ export function InboxSettings() {
 
               <IconButton
                 aria-label="Increase fetch interval"
-                data-testid="settings-fetch-interval-increase"
                 icon={PlusIcon}
                 onClick={() => {
                   const newInterval = Math.min(
@@ -135,7 +133,6 @@ export function InboxSettings() {
 
               <IconButton
                 aria-label="Reset fetch interval"
-                data-testid="settings-fetch-interval-reset"
                 icon={SyncIcon}
                 onClick={() => {
                   updateSetting('fetchInterval', Constants.DEFAULT_FETCH_NOTIFICATIONS_INTERVAL_MS);
diff --git a/src/renderer/components/settings/SystemSettings.tsx b/src/renderer/components/settings/SystemSettings.tsx
index fcf402a23..3f1189f3a 100644
--- a/src/renderer/components/settings/SystemSettings.tsx
+++ b/src/renderer/components/settings/SystemSettings.tsx
@@ -158,7 +158,6 @@ export function SystemSettings() {
 
         {shortcutRegistrationError && (
           <Banner
-            data-testid="banner-shortcut-registration-error"
             description={
               <Stack direction="vertical" gap="condensed">
                 <Text>{shortcutRegistrationError}</Text>
diff --git a/src/renderer/routes/AccountScopes.test.tsx b/src/renderer/routes/AccountScopes.test.tsx
index 62392f833..405dcb769 100644
--- a/src/renderer/routes/AccountScopes.test.tsx
+++ b/src/renderer/routes/AccountScopes.test.tsx
@@ -174,7 +174,7 @@ describe('renderer/routes/AccountScopes.tsx', () => {
       renderWithProviders(<AccountScopesRoute />);
     });
 
-    await userEvent.click(screen.getByTestId('account-scopes-manage-link'));
+    await userEvent.click(screen.getByRole('button', { name: 'Developer settings' }));
 
     expect(openAccountSettingsSpy).toHaveBeenCalledTimes(1);
   });
@@ -184,7 +184,7 @@ describe('renderer/routes/AccountScopes.tsx', () => {
       renderWithProviders(<AccountScopesRoute />);
     });
 
-    await userEvent.click(screen.getByTestId('header-nav-back'));
+    await userEvent.click(screen.getByRole('button', { name: 'Go back' }));
 
     expect(navigateMock).toHaveBeenCalledWith(-1);
   });
diff --git a/src/renderer/routes/AccountScopes.tsx b/src/renderer/routes/AccountScopes.tsx
index a224a9ec4..fc36affee 100644
--- a/src/renderer/routes/AccountScopes.tsx
+++ b/src/renderer/routes/AccountScopes.tsx
@@ -201,11 +201,7 @@ export function AccountScopesRoute() {
       </Contents>
 
       <Footer justify="end">
-        <Button
-          data-testid="account-scopes-manage-link"
-          leadingVisual={LinkExternalIcon}
-          onClick={() => openAccountSettings(account)}
-        >
+        <Button leadingVisual={LinkExternalIcon} onClick={() => openAccountSettings(account)}>
           Developer settings
         </Button>
       </Footer>
diff --git a/src/renderer/routes/Accounts.test.tsx b/src/renderer/routes/Accounts.test.tsx
index 30ca679cc..e954cac07 100644
--- a/src/renderer/routes/Accounts.test.tsx
+++ b/src/renderer/routes/Accounts.test.tsx
@@ -41,7 +41,7 @@ describe('renderer/routes/Accounts.tsx', () => {
         renderWithProviders(<AccountsRoute />);
       });
 
-      await userEvent.click(screen.getByTestId('header-nav-back'));
+      await userEvent.click(screen.getByRole('button', { name: 'Go back' }));
 
       expect(navigateMock).toHaveBeenCalledTimes(1);
       expect(navigateMock).toHaveBeenCalledWith(-1);
@@ -244,7 +244,7 @@ describe('renderer/routes/Accounts.tsx', () => {
 
       // Clicking the scopes button for the account with missing scopes
       // navigates to the scopes route where the user can investigate.
-      await userEvent.click(screen.getAllByTestId('account-view-scopes')[0]);
+      await userEvent.click(screen.getAllByRole('button', { name: /^View scopes for / })[0]);
 
       expect(navigateMock).toHaveBeenCalledWith('/account-scopes', {
         state: {
@@ -265,9 +265,9 @@ describe('renderer/routes/Accounts.tsx', () => {
 
       expect(screen.getByTestId('accounts')).toBeInTheDocument();
       // All 3 accounts render the primary/set-primary button
-      expect(screen.getAllByTestId('account-set-primary')).toHaveLength(3);
+      expect(screen.getAllByRole('button', { name: /^Set as primary account/ })).toHaveLength(3);
 
-      await userEvent.click(screen.getAllByTestId('account-set-primary')[1]);
+      await userEvent.click(screen.getAllByRole('button', { name: /^Set as primary account/ })[1]);
 
       expect(useAccountsStore.getState().accounts[0]).toBe(mockOAuthAccount);
       expect(navigateMock).toHaveBeenCalledWith('/accounts', { replace: true });
@@ -284,7 +284,7 @@ describe('renderer/routes/Accounts.tsx', () => {
         });
       });
 
-      await userEvent.click(screen.getByTestId('account-refresh'));
+      await userEvent.click(screen.getByRole('button', { name: /^Refresh / }));
 
       expect(refreshAccountSpy).toHaveBeenCalledTimes(1);
       expect(navigateMock).toHaveBeenCalledTimes(1);
@@ -303,7 +303,7 @@ describe('renderer/routes/Accounts.tsx', () => {
         });
       });
 
-      await userEvent.click(screen.getByTestId('account-logout'));
+      await userEvent.click(screen.getByRole('button', { name: /^Logout / }));
 
       expect(logoutFromAccountMock).toHaveBeenCalledTimes(1);
     });
@@ -315,7 +315,7 @@ describe('renderer/routes/Accounts.tsx', () => {
         });
       });
 
-      expect(screen.getAllByTestId('account-view-scopes')).toHaveLength(3);
+      expect(screen.getAllByRole('button', { name: /^View scopes for / })).toHaveLength(3);
     });
 
     it('navigates to account-scopes when clicking view-scopes', async () => {
@@ -325,7 +325,7 @@ describe('renderer/routes/Accounts.tsx', () => {
         });
       });
 
-      await userEvent.click(screen.getByTestId('account-view-scopes'));
+      await userEvent.click(screen.getByRole('button', { name: /^View scopes for / }));
 
       expect(navigateMock).toHaveBeenCalledWith('/account-scopes', {
         state: { account: mockPersonalAccessTokenAccount },
@@ -341,15 +341,15 @@ describe('renderer/routes/Accounts.tsx', () => {
         });
       });
 
-      await userEvent.click(screen.getByTestId('account-add-new'));
+      await userEvent.click(screen.getByRole('button', { name: 'Add new account' }));
 
-      expect(screen.getByTestId('account-add-forge-github')).toHaveTextContent('GitHub');
+      expect(screen.getByRole('menuitem', { name: /^GitHub/ })).toHaveTextContent('GitHub');
 
-      await userEvent.click(screen.getByTestId('account-add-forge-github'));
+      await userEvent.click(screen.getByRole('menuitem', { name: /^GitHub/ }));
 
-      expect(screen.getByTestId('account-add-github')).toHaveTextContent('GitHub');
+      expect(screen.getByRole('menuitem', { name: /^GitHub$/ })).toHaveTextContent('GitHub');
 
-      await userEvent.click(screen.getByTestId('account-add-github'));
+      await userEvent.click(screen.getByRole('menuitem', { name: /^GitHub$/ }));
 
       expect(navigateMock).toHaveBeenCalledTimes(1);
       expect(navigateMock).toHaveBeenCalledWith('/login/github/device-flow', {
@@ -364,12 +364,14 @@ describe('renderer/routes/Accounts.tsx', () => {
         });
       });
 
-      await userEvent.click(screen.getByTestId('account-add-new'));
-      await userEvent.click(screen.getByTestId('account-add-forge-github'));
+      await userEvent.click(screen.getByRole('button', { name: 'Add new account' }));
+      await userEvent.click(screen.getByRole('menuitem', { name: /^GitHub/ }));
 
-      expect(screen.getByTestId('account-add-pat')).toHaveTextContent('Personal Access Token');
+      expect(screen.getByRole('menuitem', { name: /^Personal Access Token/ })).toHaveTextContent(
+        'Personal Access Token',
+      );
 
-      await userEvent.click(screen.getByTestId('account-add-pat'));
+      await userEvent.click(screen.getByRole('menuitem', { name: /^Personal Access Token/ }));
 
       expect(navigateMock).toHaveBeenCalledTimes(1);
       expect(navigateMock).toHaveBeenCalledWith('/login/github/personal-access-token', {
@@ -384,12 +386,12 @@ describe('renderer/routes/Accounts.tsx', () => {
         });
       });
 
-      await userEvent.click(screen.getByTestId('account-add-new'));
-      await userEvent.click(screen.getByTestId('account-add-forge-github'));
+      await userEvent.click(screen.getByRole('button', { name: 'Add new account' }));
+      await userEvent.click(screen.getByRole('menuitem', { name: /^GitHub/ }));
 
-      expect(screen.getByTestId('account-add-oauth-app')).toHaveTextContent('OAuth App');
+      expect(screen.getByRole('menuitem', { name: /^OAuth App/ })).toHaveTextContent('OAuth App');
 
-      await userEvent.click(screen.getByTestId('account-add-oauth-app'));
+      await userEvent.click(screen.getByRole('menuitem', { name: /^OAuth App/ }));
 
       expect(navigateMock).toHaveBeenCalledTimes(1);
       expect(navigateMock).toHaveBeenCalledWith('/login/github/oauth-app', {
@@ -404,11 +406,11 @@ describe('renderer/routes/Accounts.tsx', () => {
         });
       });
 
-      await userEvent.click(screen.getByTestId('account-add-new'));
+      await userEvent.click(screen.getByRole('button', { name: 'Add new account' }));
 
-      expect(screen.getByTestId('account-add-forge-gitea')).toHaveTextContent('Gitea');
+      expect(screen.getByRole('menuitem', { name: /^Gitea/ })).toHaveTextContent('Gitea');
 
-      await userEvent.click(screen.getByTestId('account-add-forge-gitea'));
+      await userEvent.click(screen.getByRole('menuitem', { name: /^Gitea/ }));
 
       expect(navigateMock).toHaveBeenCalledTimes(1);
       expect(navigateMock).toHaveBeenCalledWith('/login/gitea/personal-access-token', {
@@ -423,11 +425,11 @@ describe('renderer/routes/Accounts.tsx', () => {
         });
       });
 
-      await userEvent.click(screen.getByTestId('account-add-new'));
+      await userEvent.click(screen.getByRole('button', { name: 'Add new account' }));
 
-      expect(screen.getByTestId('account-add-forge-bitbucket')).toHaveTextContent('Bitbucket');
+      expect(screen.getByRole('menuitem', { name: /^Bitbucket/ })).toHaveTextContent('Bitbucket');
 
-      await userEvent.click(screen.getByTestId('account-add-forge-bitbucket'));
+      await userEvent.click(screen.getByRole('menuitem', { name: /^Bitbucket/ }));
 
       expect(navigateMock).toHaveBeenCalledTimes(1);
       expect(navigateMock).toHaveBeenCalledWith('/login/bitbucket/personal-access-token', {
@@ -451,9 +453,9 @@ describe('renderer/routes/Accounts.tsx', () => {
         });
       });
 
-      expect(screen.queryByTestId('account-view-scopes')).not.toBeInTheDocument();
+      expect(screen.queryByRole('button', { name: /^View scopes for / })).not.toBeInTheDocument();
 
-      await userEvent.click(screen.getByTestId('account-reauthenticate'));
+      await userEvent.click(screen.getByRole('button', { name: /^Re-authenticate / }));
 
       expect(navigateMock).toHaveBeenCalledTimes(1);
       expect(navigateMock).toHaveBeenCalledWith('/login/github/personal-access-token', {
@@ -476,7 +478,7 @@ describe('renderer/routes/Accounts.tsx', () => {
         });
       });
 
-      await userEvent.click(screen.getByTestId('account-reauthenticate'));
+      await userEvent.click(screen.getByRole('button', { name: /^Re-authenticate / }));
 
       expect(navigateMock).toHaveBeenCalledTimes(1);
       expect(navigateMock).toHaveBeenCalledWith('/login/github/device-flow', {
@@ -499,7 +501,7 @@ describe('renderer/routes/Accounts.tsx', () => {
         });
       });
 
-      await userEvent.click(screen.getByTestId('account-reauthenticate'));
+      await userEvent.click(screen.getByRole('button', { name: /^Re-authenticate / }));
 
       expect(navigateMock).toHaveBeenCalledTimes(1);
       expect(navigateMock).toHaveBeenCalledWith('/login/github/oauth-app', {
@@ -522,7 +524,7 @@ describe('renderer/routes/Accounts.tsx', () => {
         });
       });
 
-      await userEvent.click(screen.getByTestId('account-reauthenticate'));
+      await userEvent.click(screen.getByRole('button', { name: /^Re-authenticate / }));
 
       expect(navigateMock).toHaveBeenCalledTimes(1);
       expect(navigateMock).toHaveBeenCalledWith('/login/gitea/personal-access-token', {
@@ -552,7 +554,7 @@ describe('renderer/routes/Accounts.tsx', () => {
         });
       });
 
-      await userEvent.click(screen.getByTestId('account-reauthenticate'));
+      await userEvent.click(screen.getByRole('button', { name: /^Re-authenticate / }));
 
       expect(navigateMock).not.toHaveBeenCalled();
       expect(rendererLogErrorSpy).toHaveBeenCalledWith(
@@ -599,7 +601,7 @@ describe('renderer/routes/Accounts.tsx', () => {
         });
       });
 
-      await userEvent.click(screen.getByTestId('account-refresh'));
+      await userEvent.click(screen.getByRole('button', { name: /^Refresh / }));
 
       expect(refreshAccountSpy).toHaveBeenCalledTimes(1);
       expect(navigateMock).toHaveBeenCalledWith('/accounts', { replace: true });
@@ -614,7 +616,7 @@ describe('renderer/routes/Accounts.tsx', () => {
         });
       });
 
-      expect(screen.queryByTestId('account-view-scopes')).not.toBeInTheDocument();
+      expect(screen.queryByRole('button', { name: /^View scopes for / })).not.toBeInTheDocument();
     });
   });
 });
diff --git a/src/renderer/routes/Accounts.tsx b/src/renderer/routes/Accounts.tsx
index 4b19e52d7..868e688ca 100644
--- a/src/renderer/routes/Accounts.tsx
+++ b/src/renderer/routes/Accounts.tsx
@@ -242,7 +242,6 @@ export function AccountsRoute() {
                   <Stack direction="horizontal" gap="condensed">
                     <IconButton
                       aria-label={`Set as primary account (${i === 0 ? 'current primary' : 'click to set'})`}
-                      data-testid="account-set-primary"
                       icon={i === 0 ? StarFillIcon : StarIcon}
                       onClick={() => setAsPrimaryAccount(account)}
                       size="small"
@@ -252,7 +251,6 @@ export function AccountsRoute() {
                     {!hasBadCredentials && adapter.accountOps.oauthScopes && (
                       <IconButton
                         aria-label={`View scopes for ${account.user?.login}`}
-                        data-testid="account-view-scopes"
                         icon={getScopeIcon(account)}
                         onClick={() =>
                           navigate('/account-scopes', {
@@ -271,7 +269,6 @@ export function AccountsRoute() {
                     {hasBadCredentials && (
                       <IconButton
                         aria-label={`Re-authenticate ${account.user?.login}`}
-                        data-testid="account-reauthenticate"
                         icon={KeyIcon}
                         onClick={() => handleReAuthenticate(account)}
                         size="small"
@@ -281,7 +278,6 @@ export function AccountsRoute() {
 
                     <IconButton
                       aria-label={`Refresh ${account.user?.login}`}
-                      data-testid="account-refresh"
                       icon={SyncIcon}
                       loading={loadingStates[accountUUID] || false}
                       onClick={() => handleRefresh(account)}
@@ -290,7 +286,6 @@ export function AccountsRoute() {
 
                     <IconButton
                       aria-label={`Logout ${account.user?.login}`}
-                      data-testid="account-logout"
                       icon={SignOutIcon}
                       onClick={() => logoutAccount(account)}
                       size="small"
diff --git a/src/renderer/routes/Filters.test.tsx b/src/renderer/routes/Filters.test.tsx
index 1789333b2..ba8f537e7 100644
--- a/src/renderer/routes/Filters.test.tsx
+++ b/src/renderer/routes/Filters.test.tsx
@@ -111,7 +111,7 @@ describe('renderer/routes/Filters.tsx', () => {
         });
       });
 
-      await userEvent.click(screen.getByTestId('header-nav-back'));
+      await userEvent.click(screen.getByRole('button', { name: 'Go back' }));
 
       expect(fetchNotificationsMock).toHaveBeenCalledTimes(1);
       expect(navigateMock).toHaveBeenCalledTimes(1);
@@ -125,7 +125,7 @@ describe('renderer/routes/Filters.tsx', () => {
         renderWithProviders(<FiltersRoute />);
       });
 
-      await userEvent.click(screen.getByTestId('filters-clear'));
+      await userEvent.click(screen.getByRole('button', { name: 'Clear filters' }));
 
       expect(resetSpy).toHaveBeenCalled();
     });
diff --git a/src/renderer/routes/Filters.tsx b/src/renderer/routes/Filters.tsx
index 3172a8a17..0ec0cfc41 100644
--- a/src/renderer/routes/Filters.tsx
+++ b/src/renderer/routes/Filters.tsx
@@ -40,11 +40,7 @@ export function FiltersRoute() {
 
       <Footer justify="end">
         <Tooltip direction="n" text="Clear all filters">
-          <Button
-            data-testid="filters-clear"
-            leadingVisual={FilterRemoveIcon}
-            onClick={clearFilters}
-          >
+          <Button leadingVisual={FilterRemoveIcon} onClick={clearFilters}>
             Clear filters
           </Button>
         </Tooltip>
diff --git a/src/renderer/routes/Login.tsx b/src/renderer/routes/Login.tsx
index 925551976..6a9316f44 100644
--- a/src/renderer/routes/Login.tsx
+++ b/src/renderer/routes/Login.tsx
@@ -107,7 +107,6 @@ export function LoginRoute() {
               'border border-[var(--borderColor-default)]',
               'bg-[var(--bgColor-muted)] p-1',
             )}
-            data-testid="forge-tablist"
             ref={tablistRef}
             role="tablist"
             style={{ animationDelay: '120ms' }}
@@ -121,7 +120,6 @@ export function LoginRoute() {
                   'transition-[left,width] duration-300 ease-login-out',
                   'motion-reduce:transition-none',
                 )}
-                data-testid="forge-tab-indicator"
                 style={{ left: pillRect.left, width: pillRect.width }}
               />
             )}
diff --git a/src/renderer/routes/Settings.test.tsx b/src/renderer/routes/Settings.test.tsx
index 0d4f595b9..3ebb69779 100644
--- a/src/renderer/routes/Settings.test.tsx
+++ b/src/renderer/routes/Settings.test.tsx
@@ -130,17 +130,33 @@ describe('renderer/routes/Settings.tsx', () => {
     const alerts = section('Alerts');
     const system = section('System');
 
-    expect(within(inbox).getByTestId('switch-showPills')).toBeInTheDocument();
-    expect(within(inbox).getByTestId('switch-wrapNotificationTitle')).toBeInTheDocument();
-    expect(within(inbox).queryByTestId('switch-showNotifications')).not.toBeInTheDocument();
     expect(
-      within(appearance).queryByTestId('switch-wrapNotificationTitle'),
+      within(inbox).getByRole('button', { name: 'Show notification metrics', hidden: true }),
+    ).toBeInTheDocument();
+    expect(
+      within(inbox).getByRole('button', { name: 'Show full notification title' }),
+    ).toBeInTheDocument();
+    expect(
+      within(inbox).queryByRole('button', { name: 'Show desktop notifications' }),
+    ).not.toBeInTheDocument();
+    expect(
+      within(appearance).queryByRole('button', { name: 'Show full notification title' }),
+    ).not.toBeInTheDocument();
+    expect(
+      within(alerts).getByRole('button', { name: 'Show desktop notifications' }),
+    ).toBeInTheDocument();
+    expect(
+      within(alerts).getByRole('button', { name: 'Show app update notifications' }),
+    ).toBeInTheDocument();
+    expect(
+      within(alerts).queryByRole('button', { name: 'Show notification metrics', hidden: true }),
+    ).not.toBeInTheDocument();
+    expect(
+      within(system).queryByRole('button', { name: 'Show desktop notifications' }),
+    ).not.toBeInTheDocument();
+    expect(
+      within(system).queryByRole('button', { name: 'Show app update notifications' }),
     ).not.toBeInTheDocument();
-    expect(within(alerts).getByTestId('switch-showNotifications')).toBeInTheDocument();
-    expect(within(alerts).getByTestId('switch-showUpdateNotifications')).toBeInTheDocument();
-    expect(within(alerts).queryByTestId('switch-showPills')).not.toBeInTheDocument();
-    expect(within(system).queryByTestId('switch-showNotifications')).not.toBeInTheDocument();
-    expect(within(system).queryByTestId('switch-showUpdateNotifications')).not.toBeInTheDocument();
   });
 
   it('goes back by pressing the icon', async () => {
@@ -151,7 +167,7 @@ describe('renderer/routes/Settings.tsx', () => {
       });
     });
 
-    await userEvent.click(screen.getByTestId('header-nav-back'));
+    await userEvent.click(screen.getByRole('button', { name: 'Go back' }));
 
     expect(fetchNotificationsMock).toHaveBeenCalledTimes(1);
     expect(navigateMock).toHaveBeenCalledTimes(1);
diff --git a/src/renderer/routes/bitbucket/LoginWithPersonalAccessToken.test.tsx b/src/renderer/routes/bitbucket/LoginWithPersonalAccessToken.test.tsx
index 84b10ef8b..17a8c2a27 100644
--- a/src/renderer/routes/bitbucket/LoginWithPersonalAccessToken.test.tsx
+++ b/src/renderer/routes/bitbucket/LoginWithPersonalAccessToken.test.tsx
@@ -94,7 +94,7 @@ describe('renderer/routes/bitbucket/LoginWithPersonalAccessToken.tsx', () => {
   it('opens help docs in the browser', async () => {
     renderWithProviders(<BitbucketLoginWithPersonalAccessTokenRoute />);
 
-    await userEvent.click(screen.getByTestId('login-docs'));
+    await userEvent.click(screen.getByRole('button', { name: 'Docs' }));
 
     expect(openExternalLinkSpy).toHaveBeenCalledTimes(1);
     expect(openExternalLinkSpy).toHaveBeenCalledWith(
@@ -118,6 +118,6 @@ describe('renderer/routes/bitbucket/LoginWithPersonalAccessToken.tsx', () => {
       'user@example.com',
     );
     // hostname is always bitbucket.org and not shown as an editable field
-    expect(screen.queryByTestId('login-hostname')).not.toBeInTheDocument();
+    expect(screen.queryByRole('textbox', { name: /hostname/i })).not.toBeInTheDocument();
   });
 });
diff --git a/src/renderer/routes/gitea/LoginWithPersonalAccessToken.test.tsx b/src/renderer/routes/gitea/LoginWithPersonalAccessToken.test.tsx
index cbfc43de5..ab3132816 100644
--- a/src/renderer/routes/gitea/LoginWithPersonalAccessToken.test.tsx
+++ b/src/renderer/routes/gitea/LoginWithPersonalAccessToken.test.tsx
@@ -108,7 +108,7 @@ describe('renderer/routes/gitea/LoginWithPersonalAccessToken.tsx', () => {
   it('opens help docs in the browser', async () => {
     renderWithProviders(<GiteaLoginWithPersonalAccessTokenRoute />);
 
-    await userEvent.click(screen.getByTestId('login-docs'));
+    await userEvent.click(screen.getByRole('button', { name: 'Docs' }));
 
     expect(openExternalLinkSpy).toHaveBeenCalledTimes(1);
     expect(openExternalLinkSpy).toHaveBeenCalledWith(
diff --git a/src/renderer/routes/github/LoginWithDeviceFlow.test.tsx b/src/renderer/routes/github/LoginWithDeviceFlow.test.tsx
index fbd02b89f..01ce51d51 100644
--- a/src/renderer/routes/github/LoginWithDeviceFlow.test.tsx
+++ b/src/renderer/routes/github/LoginWithDeviceFlow.test.tsx
@@ -30,8 +30,8 @@ describe('renderer/routes/github/LoginWithDeviceFlow.tsx', () => {
     });
 
     expect(screen.getByText('Receive notifications for:')).toBeInTheDocument();
-    expect(screen.getByTestId('device-scope-public')).toBeInTheDocument();
-    expect(screen.getByTestId('device-scope-full')).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: /^Public Limited/ })).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: /Public and Private/ })).toBeInTheDocument();
 
     // Device flow should not start until user makes a choice
     expect(loginWithDeviceFlowStartMock).not.toHaveBeenCalled();
@@ -52,7 +52,7 @@ describe('renderer/routes/github/LoginWithDeviceFlow.tsx', () => {
       loginWithDeviceFlowStart: loginWithDeviceFlowStartMock,
     });
 
-    await userEvent.click(screen.getByTestId('device-scope-public'));
+    await userEvent.click(screen.getByRole('button', { name: /^Public Limited/ }));
 
     expect(loginWithDeviceFlowStartMock).toHaveBeenCalledWith('github', undefined, [
       'notifications',
@@ -61,7 +61,7 @@ describe('renderer/routes/github/LoginWithDeviceFlow.tsx', () => {
     ]);
 
     await screen.findByTestId('device-user-code');
-    expect(screen.getByTestId('open-browser-button')).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: /^Open / })).toBeInTheDocument();
 
     // Verify auto-copy and auto-open were called
     expect(copyToClipboardSpy).toHaveBeenCalledWith('USER-1234');
@@ -83,7 +83,7 @@ describe('renderer/routes/github/LoginWithDeviceFlow.tsx', () => {
       loginWithDeviceFlowStart: loginWithDeviceFlowStartMock,
     });
 
-    await userEvent.click(screen.getByTestId('device-scope-full'));
+    await userEvent.click(screen.getByRole('button', { name: /Public and Private/ }));
 
     expect(loginWithDeviceFlowStartMock).toHaveBeenCalledWith('github', undefined, [
       'notifications',
@@ -109,7 +109,7 @@ describe('renderer/routes/github/LoginWithDeviceFlow.tsx', () => {
       loginWithDeviceFlowStart: loginWithDeviceFlowStartMock,
     });
 
-    await userEvent.click(screen.getByTestId('device-scope-public'));
+    await userEvent.click(screen.getByRole('button', { name: /^Public Limited/ }));
     await screen.findByTestId('device-user-code');
 
     expect(screen.getByText('Code copied to clipboard')).toBeInTheDocument();
@@ -132,17 +132,17 @@ describe('renderer/routes/github/LoginWithDeviceFlow.tsx', () => {
       loginWithDeviceFlowStart: loginWithDeviceFlowStartMock,
     });
 
-    await userEvent.click(screen.getByTestId('device-scope-public'));
+    await userEvent.click(screen.getByRole('button', { name: /^Public Limited/ }));
     await screen.findByTestId('device-user-code');
 
     // Reset spies to isolate button interactions
     openExternalLinkSpy.mockClear();
     copyToClipboardSpy.mockClear();
 
-    await userEvent.click(screen.getByTestId('open-browser-button'));
+    await userEvent.click(screen.getByRole('button', { name: /^Open / }));
     expect(openExternalLinkSpy).toHaveBeenCalledWith('https://github.com/login/device');
 
-    await userEvent.click(screen.getByTestId('copy-link-button'));
+    await userEvent.click(screen.getByRole('button', { name: 'Copy link' }));
     expect(copyToClipboardSpy).toHaveBeenCalledWith('https://github.com/login/device');
   });
 
@@ -161,13 +161,13 @@ describe('renderer/routes/github/LoginWithDeviceFlow.tsx', () => {
       loginWithDeviceFlowStart: loginWithDeviceFlowStartMock,
     });
 
-    await userEvent.click(screen.getByTestId('device-scope-public'));
+    await userEvent.click(screen.getByRole('button', { name: /^Public Limited/ }));
     await screen.findByTestId('device-user-code');
 
     // Clear the auto-copy call from initialization
     copyToClipboardSpy.mockClear();
 
-    await userEvent.click(screen.getByTestId('copy-device-code'));
+    await userEvent.click(screen.getByRole('button', { name: 'Copy device code' }));
 
     expect(copyToClipboardSpy).toHaveBeenCalledWith('USER-1234');
   });
@@ -180,7 +180,7 @@ describe('renderer/routes/github/LoginWithDeviceFlow.tsx', () => {
       loginWithDeviceFlowStart: loginWithDeviceFlowStartMock,
     });
 
-    await userEvent.click(screen.getByTestId('device-scope-full'));
+    await userEvent.click(screen.getByRole('button', { name: /Public and Private/ }));
 
     await screen.findByText(/Failed to start authentication/);
     expect(rendererLogErrorSpy).toHaveBeenCalledTimes(1);
@@ -201,7 +201,7 @@ describe('renderer/routes/github/LoginWithDeviceFlow.tsx', () => {
       loginWithDeviceFlowStart: loginWithDeviceFlowStartMock,
     });
 
-    await userEvent.click(screen.getByTestId('cancel-button'));
+    await userEvent.click(screen.getByRole('button', { name: 'Cancel' }));
 
     expect(navigateMock).toHaveBeenCalledWith(-1);
   });
@@ -225,7 +225,7 @@ describe('renderer/routes/github/LoginWithDeviceFlow.tsx', () => {
       loginWithDeviceFlowComplete: loginWithDeviceFlowCompleteMock,
     });
 
-    await userEvent.click(screen.getByTestId('device-scope-public'));
+    await userEvent.click(screen.getByRole('button', { name: /^Public Limited/ }));
     await screen.findByTestId('device-user-code');
 
     await waitFor(() => {
@@ -259,7 +259,7 @@ describe('renderer/routes/github/LoginWithDeviceFlow.tsx', () => {
       loginWithDeviceFlowPoll: loginWithDeviceFlowPollMock,
     });
 
-    await userEvent.click(screen.getByTestId('device-scope-public'));
+    await userEvent.click(screen.getByRole('button', { name: /^Public Limited/ }));
     await screen.findByTestId('device-user-code');
 
     await waitFor(() => {
@@ -286,7 +286,7 @@ describe('renderer/routes/github/LoginWithDeviceFlow.tsx', () => {
       loginWithDeviceFlowPoll: loginWithDeviceFlowPollMock,
     });
 
-    await userEvent.click(screen.getByTestId('device-scope-public'));
+    await userEvent.click(screen.getByRole('button', { name: /^Public Limited/ }));
     await screen.findByTestId('device-user-code');
 
     await waitFor(() => {
@@ -322,7 +322,7 @@ describe('renderer/routes/github/LoginWithDeviceFlow.tsx', () => {
       ],
     });
 
-    await userEvent.click(screen.getByTestId('device-scope-full'));
+    await userEvent.click(screen.getByRole('button', { name: /Public and Private/ }));
 
     expect(loginWithDeviceFlowStartMock).toHaveBeenCalledWith(
       'github',
diff --git a/src/renderer/routes/github/LoginWithDeviceFlow.tsx b/src/renderer/routes/github/LoginWithDeviceFlow.tsx
index eca790539..0dca2a874 100644
--- a/src/renderer/routes/github/LoginWithDeviceFlow.tsx
+++ b/src/renderer/routes/github/LoginWithDeviceFlow.tsx
@@ -180,7 +180,6 @@ export function GitHubLoginWithDeviceFlowRoute() {
           </Text>
           <IconButton
             aria-label="Copy device code"
-            data-testid="copy-device-code"
             icon={CopyIcon}
             onClick={handleCopyUserCode}
             size="small"
@@ -232,12 +231,7 @@ export function GitHubLoginWithDeviceFlowRoute() {
           </Stack>
         </Button>
 
-        <Button
-          block
-          data-testid="device-scope-public"
-          labelWrap
-          onClick={() => setScopeChoice('public')}
-        >
+        <Button block labelWrap onClick={() => setScopeChoice('public')}>
           <Stack gap="none">
             <Text>Public</Text>
             <Text size="small">Limited experience with least privilege permissions.</Text>
@@ -324,31 +318,21 @@ export function GitHubLoginWithDeviceFlowRoute() {
 
       {session ? (
         <Footer justify="space-between">
-          <Button
-            data-testid="open-browser-button"
-            leadingVisual={GlobeIcon}
-            onClick={handleOpenBrowser}
-            variant="primary"
-          >
+          <Button leadingVisual={GlobeIcon} onClick={handleOpenBrowser} variant="primary">
             Open {session.hostname === Constants.GITHUB_HOSTNAME ? 'GitHub.com' : session.hostname}
           </Button>
           <Stack direction="horizontal" gap="condensed">
-            <Button
-              data-testid="copy-link-button"
-              leadingVisual={LinkIcon}
-              onClick={handleCopyVerificationLink}
-              variant="default"
-            >
+            <Button leadingVisual={LinkIcon} onClick={handleCopyVerificationLink} variant="default">
               Copy link
             </Button>
-            <Button data-testid="cancel-button" onClick={() => navigate(-1)} variant="default">
+            <Button onClick={() => navigate(-1)} variant="default">
               Cancel
             </Button>
           </Stack>
         </Footer>
       ) : (
         <Footer justify="end">
-          <Button data-testid="cancel-button" onClick={() => navigate(-1)} variant="default">
+          <Button onClick={() => navigate(-1)} variant="default">
             Cancel
           </Button>
         </Footer>
diff --git a/src/renderer/routes/github/LoginWithGitHubCLI.test.tsx b/src/renderer/routes/github/LoginWithGitHubCLI.test.tsx
index ce07115d6..d0f778b88 100644
--- a/src/renderer/routes/github/LoginWithGitHubCLI.test.tsx
+++ b/src/renderer/routes/github/LoginWithGitHubCLI.test.tsx
@@ -23,7 +23,7 @@ describe('renderer/routes/github/LoginWithGitHubCLI.tsx', () => {
 
     expect(screen.queryByTestId('login-token')).not.toBeInTheDocument();
 
-    await userEvent.click(screen.getByTestId('login-submit'));
+    await userEvent.click(screen.getByRole('button', { name: 'Login' }));
 
     await waitFor(() => {
       expect(loginWithCliMock).toHaveBeenCalledWith('github', 'github.com');
@@ -36,10 +36,10 @@ describe('renderer/routes/github/LoginWithGitHubCLI.tsx', () => {
 
     renderWithProviders(<GitHubLoginWithCLIRoute />, { loginWithCli: loginWithCliMock });
 
-    const hostname = screen.getByTestId('login-hostname');
+    const hostname = screen.getByRole('textbox', { name: /Hostname/ });
     await userEvent.clear(hostname);
     await userEvent.type(hostname, 'github.gitify.io');
-    await userEvent.click(screen.getByTestId('login-submit'));
+    await userEvent.click(screen.getByRole('button', { name: 'Login' }));
 
     await waitFor(() =>
       expect(loginWithCliMock).toHaveBeenCalledWith('github', 'github.gitify.io'),
@@ -56,7 +56,7 @@ describe('renderer/routes/github/LoginWithGitHubCLI.tsx', () => {
       ],
     });
 
-    expect(screen.getByTestId('login-hostname')).toHaveValue(
+    expect(screen.getByRole('textbox', { name: /Hostname/ })).toHaveValue(
       mockGitHubEnterpriseServerAccount.hostname,
     );
   });
@@ -64,10 +64,10 @@ describe('renderer/routes/github/LoginWithGitHubCLI.tsx', () => {
   it('rejects a malformed hostname before reaching the CLI', async () => {
     renderWithProviders(<GitHubLoginWithCLIRoute />, { loginWithCli: loginWithCliMock });
 
-    const hostname = screen.getByTestId('login-hostname');
+    const hostname = screen.getByRole('textbox', { name: /Hostname/ });
     await userEvent.clear(hostname);
     await userEvent.type(hostname, 'hello');
-    await userEvent.click(screen.getByTestId('login-submit'));
+    await userEvent.click(screen.getByRole('button', { name: 'Login' }));
 
     expect(screen.getByTestId('login-errors')).toHaveTextContent('Hostname format is invalid');
     expect(loginWithCliMock).not.toHaveBeenCalled();
@@ -81,7 +81,7 @@ describe('renderer/routes/github/LoginWithGitHubCLI.tsx', () => {
 
     renderWithProviders(<GitHubLoginWithCLIRoute />, { loginWithCli: loginWithCliMock });
 
-    await userEvent.click(screen.getByTestId('login-submit'));
+    await userEvent.click(screen.getByRole('button', { name: 'Login' }));
 
     await waitFor(() =>
       expect(screen.getByTestId('login-errors')).toHaveTextContent(
diff --git a/src/renderer/routes/github/LoginWithOAuthApp.test.tsx b/src/renderer/routes/github/LoginWithOAuthApp.test.tsx
index 0a0343040..23f76bed2 100644
--- a/src/renderer/routes/github/LoginWithOAuthApp.test.tsx
+++ b/src/renderer/routes/github/LoginWithOAuthApp.test.tsx
@@ -26,7 +26,7 @@ describe('renderer/routes/github/LoginWithOAuthApp.tsx', () => {
   it('let us go back', async () => {
     renderWithProviders(<GitHubLoginWithOAuthAppRoute />);
 
-    await userEvent.click(screen.getByTestId('header-nav-back'));
+    await userEvent.click(screen.getByRole('button', { name: 'Go back' }));
 
     expect(navigateMock).toHaveBeenCalledTimes(1);
     expect(navigateMock).toHaveBeenCalledWith(-1);
@@ -136,7 +136,7 @@ describe('renderer/routes/github/LoginWithOAuthApp.tsx', () => {
   it('opens help docs in the browser', async () => {
     renderWithProviders(<GitHubLoginWithOAuthAppRoute />);
 
-    await userEvent.click(screen.getByTestId('login-docs'));
+    await userEvent.click(screen.getByRole('button', { name: 'Docs' }));
 
     expect(openExternalLinkSpy).toHaveBeenCalledTimes(1);
   });
diff --git a/src/renderer/routes/github/LoginWithOAuthApp.tsx b/src/renderer/routes/github/LoginWithOAuthApp.tsx
index 746a6533a..df1b6dbd0 100644
--- a/src/renderer/routes/github/LoginWithOAuthApp.tsx
+++ b/src/renderer/routes/github/LoginWithOAuthApp.tsx
@@ -131,7 +131,6 @@ export function GitHubLoginWithOAuthAppRoute() {
           </FormControl>
           <Stack align="center" direction="horizontal" gap="condensed">
             <Button
-              data-testid="login-create-oauth-app"
               disabled={!formData.hostname}
               leadingVisual={PersonIcon}
               onClick={() => {
@@ -153,7 +152,6 @@ export function GitHubLoginWithOAuthAppRoute() {
             <TextInput
               aria-invalid={errors.clientId ? 'true' : 'false'}
               block
-              data-testid="login-clientId"
               name="clientId"
               onChange={handleInputChange}
               placeholder="Your generated client id (20 characters)"
@@ -168,7 +166,6 @@ export function GitHubLoginWithOAuthAppRoute() {
             <TextInput
               aria-invalid={errors.clientSecret ? 'true' : 'false'}
               block
-              data-testid="login-clientSecret"
               name="clientSecret"
               onChange={handleInputChange}
               placeholder="Your generated client secret (40 characters)"
@@ -192,7 +189,6 @@ export function GitHubLoginWithOAuthAppRoute() {
       <Footer justify="space-between">
         <Tooltip text="GitHub documentation">
           <Button
-            data-testid="login-docs"
             leadingVisual={BookIcon}
             onClick={() => openExternalLink(Constants.GITHUB_DOCS.OAUTH_URL)}
             size="small"
diff --git a/src/renderer/routes/github/LoginWithPersonalAccessToken.test.tsx b/src/renderer/routes/github/LoginWithPersonalAccessToken.test.tsx
index 6a6926ad9..c641e3595 100644
--- a/src/renderer/routes/github/LoginWithPersonalAccessToken.test.tsx
+++ b/src/renderer/routes/github/LoginWithPersonalAccessToken.test.tsx
@@ -28,7 +28,7 @@ describe('renderer/routes/github/LoginWithPersonalAccessToken.tsx', () => {
   it('let us go back', async () => {
     renderWithProviders(<GitHubLoginWithPersonalAccessTokenRoute />);
 
-    await userEvent.click(screen.getByTestId('header-nav-back'));
+    await userEvent.click(screen.getByRole('button', { name: 'Go back' }));
 
     expect(navigateMock).toHaveBeenCalledTimes(1);
     expect(navigateMock).toHaveBeenCalledWith(-1);
@@ -138,7 +138,7 @@ describe('renderer/routes/github/LoginWithPersonalAccessToken.tsx', () => {
       loginWithPersonalAccessToken: loginWithPersonalAccessTokenMock,
     });
 
-    await userEvent.click(screen.getByTestId('login-docs'));
+    await userEvent.click(screen.getByRole('button', { name: 'Docs' }));
 
     expect(openExternalLinkSpy).toHaveBeenCalledTimes(1);
   });
diff --git a/src/renderer/routes/github/__snapshots__/LoginWithGitHubCLI.test.tsx.snap b/src/renderer/routes/github/__snapshots__/LoginWithGitHubCLI.test.tsx.snap
index 8e7cdc759..9714204b0 100644
--- a/src/renderer/routes/github/__snapshots__/LoginWithGitHubCLI.test.tsx.snap
+++ b/src/renderer/routes/github/__snapshots__/LoginWithGitHubCLI.test.tsx.snap
@@ -19,13 +19,12 @@ exports[`renderer/routes/github/LoginWithGitHubCLI.tsx > renders correctly 1`] =
         data-wrap="nowrap"
       >
         <button
-          aria-labelledby="Go Back"
+          aria-labelledby="_r_0_"
           class="prc-Button-ButtonBase-9n-Xk prc-Button-IconButton-fyge7"
           data-component="IconButton"
           data-loading="false"
           data-no-visuals="true"
           data-size="medium"
-          data-testid="header-nav-back"
           data-variant="invisible"
           type="button"
         >
@@ -47,6 +46,16 @@ exports[`renderer/routes/github/LoginWithGitHubCLI.tsx > renders correctly 1`] =
             />
           </svg>
         </button>
+        <span
+          aria-hidden="true"
+          class="prc-TooltipV2-Tooltip-tLeuB"
+          data-component="Tooltip"
+          data-direction="e"
+          id="_r_0_"
+          popover="auto"
+        >
+          Go back
+        </span>
         <div
           class="mb-2"
         >
@@ -159,8 +168,8 @@ exports[`renderer/routes/github/LoginWithGitHubCLI.tsx > renders correctly 1`] =
           <label
             class="prc-components-Label-2mrqP"
             data-component="FormControl.Label"
-            for="_r_1_"
-            id="_r_1_-label"
+            for="_r_2_"
+            id="_r_2_-label"
           >
             <span
               class="prc-components-RequiredText-7UsHS"
@@ -183,13 +192,13 @@ exports[`renderer/routes/github/LoginWithGitHubCLI.tsx > renders correctly 1`] =
             data-no-trailing-visual="true"
           >
             <input
-              aria-describedby="_r_1_-caption"
+              aria-describedby="_r_2_-caption"
               aria-invalid="false"
               aria-required="true"
               class="prc-components-Input-IwWrt"
               data-component="input"
               data-testid="login-hostname"
-              id="_r_1_"
+              id="_r_2_"
               name="hostname"
               type="text"
               value="github.com"
@@ -198,7 +207,7 @@ exports[`renderer/routes/github/LoginWithGitHubCLI.tsx > renders correctly 1`] =
           <span
             class="prc-FormControl-Caption-GNJPU prc-Text-Text-9mHv3"
             data-component="FormControl.Caption"
-            id="_r_1_-caption"
+            id="_r_2_-caption"
           >
             <i
               class="prc-Text-Text-9mHv3"
diff --git a/src/renderer/routes/gitlab/LoginWithPersonalAccessToken.test.tsx b/src/renderer/routes/gitlab/LoginWithPersonalAccessToken.test.tsx
index 81fb120ea..6f98df63d 100644
--- a/src/renderer/routes/gitlab/LoginWithPersonalAccessToken.test.tsx
+++ b/src/renderer/routes/gitlab/LoginWithPersonalAccessToken.test.tsx
@@ -92,7 +92,7 @@ describe('renderer/routes/gitlab/LoginWithPersonalAccessToken.tsx', () => {
   it('opens help docs in the browser', async () => {
     renderWithProviders(<GitLabLoginWithPersonalAccessTokenRoute />);
 
-    await userEvent.click(screen.getByTestId('login-docs'));
+    await userEvent.click(screen.getByRole('button', { name: 'Docs' }));
 
     expect(openExternalLinkSpy).toHaveBeenCalledTimes(1);
     expect(openExternalLinkSpy).toHaveBeenCalledWith('https://docs.gitlab.com/api/todos/');