From 9548bb71f9eea13f19f7472ad3de3542f8e617cb Mon Sep 17 00:00:00 2001
From: Janne Savolainen <janne.savolainen@live.fi>
Date: Mon, 17 Oct 2022 15:16:55 +0300
Subject: [PATCH] Remove test ID made redundant by consolidating discovery of
 HTML elements

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
---
 ...elm-repository-in-preferences.test.ts.snap | 84 -------------------
 ...tory-from-list-in-preferences.test.ts.snap | 70 ----------------
 ...m-repositories-in-preferences.test.ts.snap | 70 ----------------
 ...ive-repository-in-preferences.test.ts.snap | 28 -------
 .../closing-preferences.test.tsx.snap         | 30 -------
 ...nsion-adding-preference-tabs.test.tsx.snap |  7 --
 ...on-to-application-preferences.test.ts.snap | 14 ----
 ...igation-to-editor-preferences.test.ts.snap | 14 ----
 ...tension-specific-preferences.test.tsx.snap | 14 ----
 ...ion-to-kubernetes-preferences.test.ts.snap | 14 ----
 ...vigation-to-proxy-preferences.test.ts.snap | 14 ----
 ...ion-to-telemetry-preferences.test.tsx.snap | 29 -------
 ...ation-to-terminal-preferences.test.ts.snap | 14 ----
 ...gation-using-application-menu.test.ts.snap |  7 --
 .../navigation-using-tray.test.ts.snap        |  7 --
 .../application-preference-tab.injectable.ts  |  1 -
 .../editor-preference-tab.injectable.ts       |  1 -
 ...ensions-preference-tab-group.injectable.ts |  1 -
 ...general-preference-tab-group.injectable.ts |  1 -
 .../kubernetes-preference-tab.injectable.ts   |  1 -
 .../preference-item-injection-token.ts        |  2 -
 .../proxy/proxy-preference-tab.injectable.ts  |  1 -
 .../telemetry-preference-tab.injectable.ts    |  1 -
 .../terminal-preference-tab.injectable.ts     |  1 -
 .../preferences-navigation-tab.tsx            |  1 -
 25 files changed, 427 deletions(-)

diff --git a/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap b/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
index 65585b20cd..4016e3a837 100644
--- a/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
+++ b/src/features/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
@@ -75,7 +75,6 @@ exports[`add custom helm repository in preferences when navigating to preference
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -88,14 +87,12 @@ exports[`add custom helm repository in preferences when navigating to preference
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -108,7 +105,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -121,7 +117,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -134,7 +129,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -147,7 +141,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -680,7 +673,6 @@ exports[`add custom helm repository in preferences when navigating to preference
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -693,14 +685,12 @@ exports[`add custom helm repository in preferences when navigating to preference
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -713,7 +703,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -726,7 +715,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -739,7 +727,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -752,7 +739,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1296,7 +1282,6 @@ exports[`add custom helm repository in preferences when navigating to preference
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -1309,14 +1294,12 @@ exports[`add custom helm repository in preferences when navigating to preference
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1329,7 +1312,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1342,7 +1324,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1355,7 +1336,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1368,7 +1348,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2023,7 +2002,6 @@ exports[`add custom helm repository in preferences when navigating to preference
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -2036,14 +2014,12 @@ exports[`add custom helm repository in preferences when navigating to preference
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2056,7 +2032,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2069,7 +2044,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2082,7 +2056,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2095,7 +2068,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2647,7 +2619,6 @@ exports[`add custom helm repository in preferences when navigating to preference
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -2660,14 +2631,12 @@ exports[`add custom helm repository in preferences when navigating to preference
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2680,7 +2649,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2693,7 +2661,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2706,7 +2673,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2719,7 +2685,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3374,7 +3339,6 @@ exports[`add custom helm repository in preferences when navigating to preference
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -3387,14 +3351,12 @@ exports[`add custom helm repository in preferences when navigating to preference
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3407,7 +3369,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3420,7 +3381,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3433,7 +3393,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3446,7 +3405,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4283,7 +4241,6 @@ exports[`add custom helm repository in preferences when navigating to preference
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -4296,14 +4253,12 @@ exports[`add custom helm repository in preferences when navigating to preference
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4316,7 +4271,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4329,7 +4283,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4342,7 +4295,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4355,7 +4307,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5010,7 +4961,6 @@ exports[`add custom helm repository in preferences when navigating to preference
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -5023,14 +4973,12 @@ exports[`add custom helm repository in preferences when navigating to preference
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5043,7 +4991,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5056,7 +5003,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5069,7 +5015,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5082,7 +5027,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5919,7 +5863,6 @@ exports[`add custom helm repository in preferences when navigating to preference
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -5932,14 +5875,12 @@ exports[`add custom helm repository in preferences when navigating to preference
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5952,7 +5893,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5965,7 +5905,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5978,7 +5917,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5991,7 +5929,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -6647,7 +6584,6 @@ exports[`add custom helm repository in preferences when navigating to preference
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -6660,14 +6596,12 @@ exports[`add custom helm repository in preferences when navigating to preference
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -6680,7 +6614,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -6693,7 +6626,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -6706,7 +6638,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -6719,7 +6650,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -7271,7 +7201,6 @@ exports[`add custom helm repository in preferences when navigating to preference
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -7284,14 +7213,12 @@ exports[`add custom helm repository in preferences when navigating to preference
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -7304,7 +7231,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -7317,7 +7243,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -7330,7 +7255,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -7343,7 +7267,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -7884,7 +7807,6 @@ exports[`add custom helm repository in preferences when navigating to preference
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -7897,14 +7819,12 @@ exports[`add custom helm repository in preferences when navigating to preference
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -7917,7 +7837,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -7930,7 +7849,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -7943,7 +7861,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -7956,7 +7873,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
diff --git a/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap b/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
index 50a4a8a5e2..c9e037260c 100644
--- a/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
+++ b/src/features/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
@@ -75,7 +75,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -88,14 +87,12 @@ exports[`add helm repository from list in preferences when navigating to prefere
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -108,7 +105,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -121,7 +117,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -134,7 +129,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -147,7 +141,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -680,7 +673,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -693,14 +685,12 @@ exports[`add helm repository from list in preferences when navigating to prefere
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -713,7 +703,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -726,7 +715,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -739,7 +727,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -752,7 +739,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1296,7 +1282,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -1309,14 +1294,12 @@ exports[`add helm repository from list in preferences when navigating to prefere
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1329,7 +1312,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1342,7 +1324,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1355,7 +1336,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1368,7 +1348,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1965,7 +1944,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -1978,14 +1956,12 @@ exports[`add helm repository from list in preferences when navigating to prefere
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1998,7 +1974,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2011,7 +1986,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2024,7 +1998,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2037,7 +2010,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2581,7 +2553,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -2594,14 +2565,12 @@ exports[`add helm repository from list in preferences when navigating to prefere
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2614,7 +2583,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2627,7 +2595,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2640,7 +2607,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2653,7 +2619,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3197,7 +3162,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -3210,14 +3174,12 @@ exports[`add helm repository from list in preferences when navigating to prefere
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3230,7 +3192,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3243,7 +3204,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3256,7 +3216,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3269,7 +3228,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3802,7 +3760,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -3815,14 +3772,12 @@ exports[`add helm repository from list in preferences when navigating to prefere
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3835,7 +3790,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3848,7 +3802,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3861,7 +3814,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3874,7 +3826,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4452,7 +4403,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -4465,14 +4415,12 @@ exports[`add helm repository from list in preferences when navigating to prefere
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4485,7 +4433,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4498,7 +4445,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4511,7 +4457,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4524,7 +4469,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5165,7 +5109,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -5178,14 +5121,12 @@ exports[`add helm repository from list in preferences when navigating to prefere
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5198,7 +5139,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5211,7 +5151,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5224,7 +5163,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5237,7 +5175,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5815,7 +5752,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -5828,14 +5764,12 @@ exports[`add helm repository from list in preferences when navigating to prefere
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5848,7 +5782,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5861,7 +5794,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5874,7 +5806,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5887,7 +5818,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
diff --git a/src/features/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap b/src/features/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
index 3416770a0e..ba598a2c44 100644
--- a/src/features/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
+++ b/src/features/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
@@ -75,7 +75,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -88,14 +87,12 @@ exports[`listing active helm repositories in preferences when navigating to pref
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -108,7 +105,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -121,7 +117,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -134,7 +129,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -147,7 +141,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -680,7 +673,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -693,14 +685,12 @@ exports[`listing active helm repositories in preferences when navigating to pref
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -713,7 +703,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -726,7 +715,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -739,7 +727,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -752,7 +739,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1285,7 +1271,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -1298,14 +1283,12 @@ exports[`listing active helm repositories in preferences when navigating to pref
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1318,7 +1301,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1331,7 +1313,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1344,7 +1325,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1357,7 +1337,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1782,7 +1761,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -1795,14 +1773,12 @@ exports[`listing active helm repositories in preferences when navigating to pref
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1815,7 +1791,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1828,7 +1803,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1841,7 +1815,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1854,7 +1827,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2387,7 +2359,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -2400,14 +2371,12 @@ exports[`listing active helm repositories in preferences when navigating to pref
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2420,7 +2389,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2433,7 +2401,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2446,7 +2413,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2459,7 +2425,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2884,7 +2849,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -2897,14 +2861,12 @@ exports[`listing active helm repositories in preferences when navigating to pref
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2917,7 +2879,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2930,7 +2891,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2943,7 +2903,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -2956,7 +2915,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3489,7 +3447,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -3502,14 +3459,12 @@ exports[`listing active helm repositories in preferences when navigating to pref
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3522,7 +3477,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3535,7 +3489,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3548,7 +3501,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -3561,7 +3513,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4139,7 +4090,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -4152,14 +4102,12 @@ exports[`listing active helm repositories in preferences when navigating to pref
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4172,7 +4120,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4185,7 +4132,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4198,7 +4144,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4211,7 +4156,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4636,7 +4580,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -4649,14 +4592,12 @@ exports[`listing active helm repositories in preferences when navigating to pref
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4669,7 +4610,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4682,7 +4622,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4695,7 +4634,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -4708,7 +4646,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5133,7 +5070,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -5146,14 +5082,12 @@ exports[`listing active helm repositories in preferences when navigating to pref
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5166,7 +5100,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5179,7 +5112,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5192,7 +5124,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -5205,7 +5136,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
diff --git a/src/features/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap b/src/features/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
index 65709c9bf5..0b076e5dae 100644
--- a/src/features/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
+++ b/src/features/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
@@ -75,7 +75,6 @@ exports[`remove helm repository from list of active repositories in preferences
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -88,14 +87,12 @@ exports[`remove helm repository from list of active repositories in preferences
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -108,7 +105,6 @@ exports[`remove helm repository from list of active repositories in preferences
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -121,7 +117,6 @@ exports[`remove helm repository from list of active repositories in preferences
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -134,7 +129,6 @@ exports[`remove helm repository from list of active repositories in preferences
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -147,7 +141,6 @@ exports[`remove helm repository from list of active repositories in preferences
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -680,7 +673,6 @@ exports[`remove helm repository from list of active repositories in preferences
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -693,14 +685,12 @@ exports[`remove helm repository from list of active repositories in preferences
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -713,7 +703,6 @@ exports[`remove helm repository from list of active repositories in preferences
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -726,7 +715,6 @@ exports[`remove helm repository from list of active repositories in preferences
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -739,7 +727,6 @@ exports[`remove helm repository from list of active repositories in preferences
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -752,7 +739,6 @@ exports[`remove helm repository from list of active repositories in preferences
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1296,7 +1282,6 @@ exports[`remove helm repository from list of active repositories in preferences
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -1309,14 +1294,12 @@ exports[`remove helm repository from list of active repositories in preferences
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1329,7 +1312,6 @@ exports[`remove helm repository from list of active repositories in preferences
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1342,7 +1324,6 @@ exports[`remove helm repository from list of active repositories in preferences
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1355,7 +1336,6 @@ exports[`remove helm repository from list of active repositories in preferences
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1368,7 +1348,6 @@ exports[`remove helm repository from list of active repositories in preferences
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1912,7 +1891,6 @@ exports[`remove helm repository from list of active repositories in preferences
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="kubernetes-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -1925,14 +1903,12 @@ exports[`remove helm repository from list of active repositories in preferences
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1945,7 +1921,6 @@ exports[`remove helm repository from list of active repositories in preferences
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1958,7 +1933,6 @@ exports[`remove helm repository from list of active repositories in preferences
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1971,7 +1945,6 @@ exports[`remove helm repository from list of active repositories in preferences
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -1984,7 +1957,6 @@ exports[`remove helm repository from list of active repositories in preferences
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
diff --git a/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap b/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap
index 4986ce3052..665787a5d9 100644
--- a/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap
+++ b/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap
@@ -74,7 +74,6 @@ exports[`preferences - closing-preferences given accessing preferences directly
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="application-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -87,14 +86,12 @@ exports[`preferences - closing-preferences given accessing preferences directly
             >
               <div
                 class="header flex items-center"
-                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center active"
                 data-preference-tab-link-test="app"
-                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -107,7 +104,6 @@ exports[`preferences - closing-preferences given accessing preferences directly
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="proxy"
-                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -120,7 +116,6 @@ exports[`preferences - closing-preferences given accessing preferences directly
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="kubernetes"
-                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -133,7 +128,6 @@ exports[`preferences - closing-preferences given accessing preferences directly
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="editor"
-                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -146,7 +140,6 @@ exports[`preferences - closing-preferences given accessing preferences directly
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="terminal"
-                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -159,7 +152,6 @@ exports[`preferences - closing-preferences given accessing preferences directly
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="some-path-id-for-some-test-tab-id"
-                data-testid="some-test-id-for-some-test-tab-id"
                 role="tab"
                 tabindex="0"
               >
@@ -765,14 +757,12 @@ exports[`preferences - closing-preferences given accessing preferences directly
             >
               <div
                 class="header flex items-center"
-                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="app"
-                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -785,7 +775,6 @@ exports[`preferences - closing-preferences given accessing preferences directly
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="proxy"
-                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -798,7 +787,6 @@ exports[`preferences - closing-preferences given accessing preferences directly
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="kubernetes"
-                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -811,7 +799,6 @@ exports[`preferences - closing-preferences given accessing preferences directly
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="editor"
-                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -824,7 +811,6 @@ exports[`preferences - closing-preferences given accessing preferences directly
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="terminal"
-                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -837,7 +823,6 @@ exports[`preferences - closing-preferences given accessing preferences directly
               <div
                 class="Tab flex gaps align-center active"
                 data-preference-tab-link-test="some-path-id-for-some-test-tab-id"
-                data-testid="some-test-id-for-some-test-tab-id"
                 role="tab"
                 tabindex="0"
               >
@@ -1318,7 +1303,6 @@ exports[`preferences - closing-preferences given already in a page and then navi
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="application-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -1331,14 +1315,12 @@ exports[`preferences - closing-preferences given already in a page and then navi
             >
               <div
                 class="header flex items-center"
-                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center active"
                 data-preference-tab-link-test="app"
-                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -1351,7 +1333,6 @@ exports[`preferences - closing-preferences given already in a page and then navi
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="proxy"
-                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -1364,7 +1345,6 @@ exports[`preferences - closing-preferences given already in a page and then navi
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="kubernetes"
-                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -1377,7 +1357,6 @@ exports[`preferences - closing-preferences given already in a page and then navi
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="editor"
-                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -1390,7 +1369,6 @@ exports[`preferences - closing-preferences given already in a page and then navi
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="terminal"
-                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -1403,7 +1381,6 @@ exports[`preferences - closing-preferences given already in a page and then navi
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="some-path-id-for-some-test-tab-id"
-                data-testid="some-test-id-for-some-test-tab-id"
                 role="tab"
                 tabindex="0"
               >
@@ -2009,14 +1986,12 @@ exports[`preferences - closing-preferences given already in a page and then navi
             >
               <div
                 class="header flex items-center"
-                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="app"
-                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -2029,7 +2004,6 @@ exports[`preferences - closing-preferences given already in a page and then navi
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="proxy"
-                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -2042,7 +2016,6 @@ exports[`preferences - closing-preferences given already in a page and then navi
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="kubernetes"
-                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -2055,7 +2028,6 @@ exports[`preferences - closing-preferences given already in a page and then navi
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="editor"
-                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -2068,7 +2040,6 @@ exports[`preferences - closing-preferences given already in a page and then navi
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="terminal"
-                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -2081,7 +2052,6 @@ exports[`preferences - closing-preferences given already in a page and then navi
               <div
                 class="Tab flex gaps align-center active"
                 data-preference-tab-link-test="some-path-id-for-some-test-tab-id"
-                data-testid="some-test-id-for-some-test-tab-id"
                 role="tab"
                 tabindex="0"
               >
diff --git a/src/features/preferences/__snapshots__/extension-adding-preference-tabs.test.tsx.snap b/src/features/preferences/__snapshots__/extension-adding-preference-tabs.test.tsx.snap
index 47acd7d674..0686607919 100644
--- a/src/features/preferences/__snapshots__/extension-adding-preference-tabs.test.tsx.snap
+++ b/src/features/preferences/__snapshots__/extension-adding-preference-tabs.test.tsx.snap
@@ -75,7 +75,6 @@ exports[`preferences: extension adding preference tabs given in preferences, whe
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="application-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -88,14 +87,12 @@ exports[`preferences: extension adding preference tabs given in preferences, whe
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -108,7 +105,6 @@ exports[`preferences: extension adding preference tabs given in preferences, whe
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -121,7 +117,6 @@ exports[`preferences: extension adding preference tabs given in preferences, whe
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -134,7 +129,6 @@ exports[`preferences: extension adding preference tabs given in preferences, whe
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -147,7 +141,6 @@ exports[`preferences: extension adding preference tabs given in preferences, whe
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
diff --git a/src/features/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap b/src/features/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap
index f4bb03e7a5..9bc496de2f 100644
--- a/src/features/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap
@@ -74,7 +74,6 @@ exports[`preferences - navigation to application preferences given in some child
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="proxy-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -87,14 +86,12 @@ exports[`preferences - navigation to application preferences given in some child
             >
               <div
                 class="header flex items-center"
-                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="app"
-                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -107,7 +104,6 @@ exports[`preferences - navigation to application preferences given in some child
               <div
                 class="Tab flex gaps align-center active"
                 data-preference-tab-link-test="proxy"
-                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -120,7 +116,6 @@ exports[`preferences - navigation to application preferences given in some child
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="kubernetes"
-                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -133,7 +128,6 @@ exports[`preferences - navigation to application preferences given in some child
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="editor"
-                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -146,7 +140,6 @@ exports[`preferences - navigation to application preferences given in some child
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="terminal"
-                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -411,7 +404,6 @@ exports[`preferences - navigation to application preferences given in some child
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="application-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -424,14 +416,12 @@ exports[`preferences - navigation to application preferences given in some child
             >
               <div
                 class="header flex items-center"
-                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center active"
                 data-preference-tab-link-test="app"
-                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -444,7 +434,6 @@ exports[`preferences - navigation to application preferences given in some child
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="proxy"
-                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -457,7 +446,6 @@ exports[`preferences - navigation to application preferences given in some child
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="kubernetes"
-                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -470,7 +458,6 @@ exports[`preferences - navigation to application preferences given in some child
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="editor"
-                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -483,7 +470,6 @@ exports[`preferences - navigation to application preferences given in some child
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="terminal"
-                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
diff --git a/src/features/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap b/src/features/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap
index d5b44dc58f..c6fb8a1891 100644
--- a/src/features/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap
@@ -74,7 +74,6 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="application-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -87,14 +86,12 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
             >
               <div
                 class="header flex items-center"
-                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center active"
                 data-preference-tab-link-test="app"
-                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -107,7 +104,6 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="proxy"
-                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -120,7 +116,6 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="kubernetes"
-                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -133,7 +128,6 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="editor"
-                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -146,7 +140,6 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="terminal"
-                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -739,7 +732,6 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="editor-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -752,14 +744,12 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
             >
               <div
                 class="header flex items-center"
-                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="app"
-                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -772,7 +762,6 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="proxy"
-                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -785,7 +774,6 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="kubernetes"
-                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -798,7 +786,6 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
               <div
                 class="Tab flex gaps align-center active"
                 data-preference-tab-link-test="editor"
-                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -811,7 +798,6 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="terminal"
-                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
diff --git a/src/features/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap b/src/features/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
index 121e1e8100..e6c9e50f12 100644
--- a/src/features/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
@@ -1376,7 +1376,6 @@ exports[`preferences - navigation to extension specific preferences given in pre
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="application-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -1389,14 +1388,12 @@ exports[`preferences - navigation to extension specific preferences given in pre
             >
               <div
                 class="header flex items-center"
-                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center active"
                 data-preference-tab-link-test="app"
-                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -1409,7 +1406,6 @@ exports[`preferences - navigation to extension specific preferences given in pre
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="proxy"
-                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -1422,7 +1418,6 @@ exports[`preferences - navigation to extension specific preferences given in pre
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="kubernetes"
-                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -1435,7 +1430,6 @@ exports[`preferences - navigation to extension specific preferences given in pre
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="editor"
-                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -1448,7 +1442,6 @@ exports[`preferences - navigation to extension specific preferences given in pre
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="terminal"
-                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -2041,7 +2034,6 @@ exports[`preferences - navigation to extension specific preferences given in pre
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="application-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -2054,14 +2046,12 @@ exports[`preferences - navigation to extension specific preferences given in pre
             >
               <div
                 class="header flex items-center"
-                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center active"
                 data-preference-tab-link-test="app"
-                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -2074,7 +2064,6 @@ exports[`preferences - navigation to extension specific preferences given in pre
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="proxy"
-                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -2087,7 +2076,6 @@ exports[`preferences - navigation to extension specific preferences given in pre
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="kubernetes"
-                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -2100,7 +2088,6 @@ exports[`preferences - navigation to extension specific preferences given in pre
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="editor"
-                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -2113,7 +2100,6 @@ exports[`preferences - navigation to extension specific preferences given in pre
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="terminal"
-                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
diff --git a/src/features/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap b/src/features/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap
index 91c78fe10a..a1ce389ca6 100644
--- a/src/features/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap
@@ -74,7 +74,6 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="application-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -87,14 +86,12 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
             >
               <div
                 class="header flex items-center"
-                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center active"
                 data-preference-tab-link-test="app"
-                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -107,7 +104,6 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="proxy"
-                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -120,7 +116,6 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="kubernetes"
-                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -133,7 +128,6 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="editor"
-                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -146,7 +140,6 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="terminal"
-                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -739,7 +732,6 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="kubernetes-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -752,14 +744,12 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
             >
               <div
                 class="header flex items-center"
-                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="app"
-                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -772,7 +762,6 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="proxy"
-                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -785,7 +774,6 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
               <div
                 class="Tab flex gaps align-center active"
                 data-preference-tab-link-test="kubernetes"
-                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -798,7 +786,6 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="editor"
-                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -811,7 +798,6 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="terminal"
-                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
diff --git a/src/features/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap b/src/features/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap
index 8e56520f9a..6d21b42997 100644
--- a/src/features/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap
@@ -74,7 +74,6 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="application-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -87,14 +86,12 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
             >
               <div
                 class="header flex items-center"
-                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center active"
                 data-preference-tab-link-test="app"
-                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -107,7 +104,6 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="proxy"
-                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -120,7 +116,6 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="kubernetes"
-                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -133,7 +128,6 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="editor"
-                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -146,7 +140,6 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="terminal"
-                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -739,7 +732,6 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="proxy-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -752,14 +744,12 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
             >
               <div
                 class="header flex items-center"
-                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="app"
-                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -772,7 +762,6 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
               <div
                 class="Tab flex gaps align-center active"
                 data-preference-tab-link-test="proxy"
-                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -785,7 +774,6 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="kubernetes"
-                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -798,7 +786,6 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="editor"
-                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -811,7 +798,6 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="terminal"
-                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
diff --git a/src/features/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap b/src/features/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap
index 9ed3c4e871..2740cbabd7 100644
--- a/src/features/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap
@@ -74,7 +74,6 @@ exports[`preferences - navigation to telemetry preferences given URL for Sentry
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="terminal-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -87,14 +86,12 @@ exports[`preferences - navigation to telemetry preferences given URL for Sentry
             >
               <div
                 class="header flex items-center"
-                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="app"
-                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -107,7 +104,6 @@ exports[`preferences - navigation to telemetry preferences given URL for Sentry
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="proxy"
-                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -120,7 +116,6 @@ exports[`preferences - navigation to telemetry preferences given URL for Sentry
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="kubernetes"
-                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -133,7 +128,6 @@ exports[`preferences - navigation to telemetry preferences given URL for Sentry
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="editor"
-                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -146,7 +140,6 @@ exports[`preferences - navigation to telemetry preferences given URL for Sentry
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="terminal"
-                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -159,7 +152,6 @@ exports[`preferences - navigation to telemetry preferences given URL for Sentry
               <div
                 class="Tab flex gaps align-center active"
                 data-preference-tab-link-test="telemetry"
-                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -399,7 +391,6 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="application-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -412,14 +403,12 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
             >
               <div
                 class="header flex items-center"
-                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center active"
                 data-preference-tab-link-test="app"
-                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -432,7 +421,6 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="proxy"
-                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -445,7 +433,6 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="kubernetes"
-                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -458,7 +445,6 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="editor"
-                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -471,7 +457,6 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="terminal"
-                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -1064,7 +1049,6 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="application-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -1077,14 +1061,12 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
             >
               <div
                 class="header flex items-center"
-                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center active"
                 data-preference-tab-link-test="app"
-                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -1097,7 +1079,6 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="proxy"
-                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -1110,7 +1091,6 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="kubernetes"
-                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -1123,7 +1103,6 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="editor"
-                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -1136,7 +1115,6 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="terminal"
-                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -2036,7 +2014,6 @@ exports[`preferences - navigation to telemetry preferences given no URL for Sent
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="terminal-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -2049,14 +2026,12 @@ exports[`preferences - navigation to telemetry preferences given no URL for Sent
             >
               <div
                 class="header flex items-center"
-                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="app"
-                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -2069,7 +2044,6 @@ exports[`preferences - navigation to telemetry preferences given no URL for Sent
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="proxy"
-                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -2082,7 +2056,6 @@ exports[`preferences - navigation to telemetry preferences given no URL for Sent
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="kubernetes"
-                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -2095,7 +2068,6 @@ exports[`preferences - navigation to telemetry preferences given no URL for Sent
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="editor"
-                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -2108,7 +2080,6 @@ exports[`preferences - navigation to telemetry preferences given no URL for Sent
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="terminal"
-                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
diff --git a/src/features/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap b/src/features/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap
index 1a799687dc..3f0cff7a8e 100644
--- a/src/features/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap
@@ -74,7 +74,6 @@ exports[`preferences - navigation to terminal preferences given in preferences,
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="application-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -87,14 +86,12 @@ exports[`preferences - navigation to terminal preferences given in preferences,
             >
               <div
                 class="header flex items-center"
-                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center active"
                 data-preference-tab-link-test="app"
-                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -107,7 +104,6 @@ exports[`preferences - navigation to terminal preferences given in preferences,
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="proxy"
-                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -120,7 +116,6 @@ exports[`preferences - navigation to terminal preferences given in preferences,
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="kubernetes"
-                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -133,7 +128,6 @@ exports[`preferences - navigation to terminal preferences given in preferences,
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="editor"
-                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -146,7 +140,6 @@ exports[`preferences - navigation to terminal preferences given in preferences,
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="terminal"
-                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -739,7 +732,6 @@ exports[`preferences - navigation to terminal preferences given in preferences,
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="terminal-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -752,14 +744,12 @@ exports[`preferences - navigation to terminal preferences given in preferences,
             >
               <div
                 class="header flex items-center"
-                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="app"
-                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -772,7 +762,6 @@ exports[`preferences - navigation to terminal preferences given in preferences,
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="proxy"
-                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -785,7 +774,6 @@ exports[`preferences - navigation to terminal preferences given in preferences,
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="kubernetes"
-                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -798,7 +786,6 @@ exports[`preferences - navigation to terminal preferences given in preferences,
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="editor"
-                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -811,7 +798,6 @@ exports[`preferences - navigation to terminal preferences given in preferences,
               <div
                 class="Tab flex gaps align-center active"
                 data-preference-tab-link-test="terminal"
-                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
diff --git a/src/features/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap b/src/features/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap
index e77770c73f..1f93f2cea9 100644
--- a/src/features/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap
@@ -292,7 +292,6 @@ exports[`preferences - navigation using application menu when navigating to pref
       />
       <div
         class="SettingLayout showNavigation Preferences"
-        data-testid="application-preferences-page"
       >
         <nav
           class="sidebarRegion"
@@ -305,14 +304,12 @@ exports[`preferences - navigation using application menu when navigating to pref
             >
               <div
                 class="header flex items-center"
-                data-testid="general-tab-group"
               >
                 Preferences
               </div>
               <div
                 class="Tab flex gaps align-center active"
                 data-preference-tab-link-test="app"
-                data-testid="application-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -325,7 +322,6 @@ exports[`preferences - navigation using application menu when navigating to pref
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="proxy"
-                data-testid="proxy-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -338,7 +334,6 @@ exports[`preferences - navigation using application menu when navigating to pref
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="kubernetes"
-                data-testid="kubernetes-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -351,7 +346,6 @@ exports[`preferences - navigation using application menu when navigating to pref
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="editor"
-                data-testid="editor-preferences-page"
                 role="tab"
                 tabindex="0"
               >
@@ -364,7 +358,6 @@ exports[`preferences - navigation using application menu when navigating to pref
               <div
                 class="Tab flex gaps align-center"
                 data-preference-tab-link-test="terminal"
-                data-testid="terminal-preferences-page"
                 role="tab"
                 tabindex="0"
               >
diff --git a/src/features/preferences/__snapshots__/navigation-using-tray.test.ts.snap b/src/features/preferences/__snapshots__/navigation-using-tray.test.ts.snap
index 9094886029..517640929e 100644
--- a/src/features/preferences/__snapshots__/navigation-using-tray.test.ts.snap
+++ b/src/features/preferences/__snapshots__/navigation-using-tray.test.ts.snap
@@ -295,7 +295,6 @@ exports[`show-about-using-tray when navigating using tray renders 1`] = `
         />
         <div
           class="SettingLayout showNavigation Preferences"
-          data-testid="application-preferences-page"
         >
           <nav
             class="sidebarRegion"
@@ -308,14 +307,12 @@ exports[`show-about-using-tray when navigating using tray renders 1`] = `
               >
                 <div
                   class="header flex items-center"
-                  data-testid="general-tab-group"
                 >
                   Preferences
                 </div>
                 <div
                   class="Tab flex gaps align-center active"
                   data-preference-tab-link-test="app"
-                  data-testid="application-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -328,7 +325,6 @@ exports[`show-about-using-tray when navigating using tray renders 1`] = `
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="proxy"
-                  data-testid="proxy-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -341,7 +337,6 @@ exports[`show-about-using-tray when navigating using tray renders 1`] = `
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="kubernetes"
-                  data-testid="kubernetes-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -354,7 +349,6 @@ exports[`show-about-using-tray when navigating using tray renders 1`] = `
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="editor"
-                  data-testid="editor-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
@@ -367,7 +361,6 @@ exports[`show-about-using-tray when navigating using tray renders 1`] = `
                 <div
                   class="Tab flex gaps align-center"
                   data-preference-tab-link-test="terminal"
-                  data-testid="terminal-preferences-page"
                   role="tab"
                   tabindex="0"
                 >
diff --git a/src/features/preferences/renderer/preference-items/application/application-preference-tab.injectable.ts b/src/features/preferences/renderer/preference-items/application/application-preference-tab.injectable.ts
index 623fe084cf..0091dd2023 100644
--- a/src/features/preferences/renderer/preference-items/application/application-preference-tab.injectable.ts
+++ b/src/features/preferences/renderer/preference-items/application/application-preference-tab.injectable.ts
@@ -13,7 +13,6 @@ const applicationPreferenceTabInjectable = getInjectable({
     id: "application-tab",
     parentId: "general-tab-group" as const,
     pathId: "app",
-    testId: "application-preferences-page",
     label: "App",
     orderNumber: 10,
   }),
diff --git a/src/features/preferences/renderer/preference-items/editor/editor-preference-tab.injectable.ts b/src/features/preferences/renderer/preference-items/editor/editor-preference-tab.injectable.ts
index 1c07a27442..c1dc4a29c0 100644
--- a/src/features/preferences/renderer/preference-items/editor/editor-preference-tab.injectable.ts
+++ b/src/features/preferences/renderer/preference-items/editor/editor-preference-tab.injectable.ts
@@ -13,7 +13,6 @@ const editorPreferenceTabInjectable = getInjectable({
     id: "editor-tab",
     parentId: "general-tab-group" as const,
     pathId: "editor",
-    testId: "editor-preferences-page",
     label: "Editor",
     orderNumber: 40,
   }),
diff --git a/src/features/preferences/renderer/preference-items/extensions-preference-tab-group.injectable.ts b/src/features/preferences/renderer/preference-items/extensions-preference-tab-group.injectable.ts
index fe7da9d9f9..1a5fdb6645 100644
--- a/src/features/preferences/renderer/preference-items/extensions-preference-tab-group.injectable.ts
+++ b/src/features/preferences/renderer/preference-items/extensions-preference-tab-group.injectable.ts
@@ -11,7 +11,6 @@ const extensionsPreferenceTabGroupInjectable = getInjectable({
   instantiate: () => ({
     kind: "tab-group" as const,
     id: "extensions-tab-group",
-    testId: "extensions-tab-group",
     parentId: "preference-tabs" as const,
     label: "Extensions",
     orderNumber: 20,
diff --git a/src/features/preferences/renderer/preference-items/general-preference-tab-group.injectable.ts b/src/features/preferences/renderer/preference-items/general-preference-tab-group.injectable.ts
index 946f34d78a..fe46026aa8 100644
--- a/src/features/preferences/renderer/preference-items/general-preference-tab-group.injectable.ts
+++ b/src/features/preferences/renderer/preference-items/general-preference-tab-group.injectable.ts
@@ -11,7 +11,6 @@ const generalPreferenceTabGroupInjectable = getInjectable({
   instantiate: () => ({
     kind: "tab-group" as const,
     id: "general-tab-group",
-    testId: "general-tab-group",
     parentId: "preference-tabs" as const,
     label: "Preferences",
     orderNumber: 10,
diff --git a/src/features/preferences/renderer/preference-items/kubernetes/kubernetes-preference-tab.injectable.ts b/src/features/preferences/renderer/preference-items/kubernetes/kubernetes-preference-tab.injectable.ts
index e24d0b2061..ae33f1177a 100644
--- a/src/features/preferences/renderer/preference-items/kubernetes/kubernetes-preference-tab.injectable.ts
+++ b/src/features/preferences/renderer/preference-items/kubernetes/kubernetes-preference-tab.injectable.ts
@@ -13,7 +13,6 @@ const kubernetesPreferenceTabInjectable = getInjectable({
     id: "kubernetes-tab",
     parentId: "general-tab-group" as const,
     pathId: "kubernetes",
-    testId: "kubernetes-preferences-page",
     label: "Kubernetes",
     orderNumber: 30,
   }),
diff --git a/src/features/preferences/renderer/preference-items/preference-item-injection-token.ts b/src/features/preferences/renderer/preference-items/preference-item-injection-token.ts
index 935b9052d3..ffe69c1487 100644
--- a/src/features/preferences/renderer/preference-items/preference-item-injection-token.ts
+++ b/src/features/preferences/renderer/preference-items/preference-item-injection-token.ts
@@ -12,7 +12,6 @@ export interface PreferenceTab {
   id: string;
   parentId: string;
   pathId: string;
-  testId: string;
   label: string;
   orderNumber: number;
   isShown?: boolean;
@@ -22,7 +21,6 @@ export interface PreferenceTabGroup {
   kind: "tab-group";
   id: string;
   parentId: "preference-tabs";
-  testId: string;
   label: string;
   orderNumber: number;
   isShown?: boolean;
diff --git a/src/features/preferences/renderer/preference-items/proxy/proxy-preference-tab.injectable.ts b/src/features/preferences/renderer/preference-items/proxy/proxy-preference-tab.injectable.ts
index 7d22847314..6b33c9f1d1 100644
--- a/src/features/preferences/renderer/preference-items/proxy/proxy-preference-tab.injectable.ts
+++ b/src/features/preferences/renderer/preference-items/proxy/proxy-preference-tab.injectable.ts
@@ -13,7 +13,6 @@ const proxyPreferenceTabInjectable = getInjectable({
     id: "proxy-tab",
     parentId: "general-tab-group" as const,
     pathId: "proxy",
-    testId: "proxy-preferences-page",
     label: "Proxy",
     orderNumber: 20,
   }),
diff --git a/src/features/preferences/renderer/preference-items/telemetry/telemetry-preference-tab.injectable.ts b/src/features/preferences/renderer/preference-items/telemetry/telemetry-preference-tab.injectable.ts
index e95ae98b4d..46021d7344 100644
--- a/src/features/preferences/renderer/preference-items/telemetry/telemetry-preference-tab.injectable.ts
+++ b/src/features/preferences/renderer/preference-items/telemetry/telemetry-preference-tab.injectable.ts
@@ -13,7 +13,6 @@ const telemetryPreferenceTabInjectable = getInjectable({
     id: "telemetry-tab",
     parentId: "general-tab-group" as const,
     pathId: "telemetry",
-    testId: "terminal-preferences-page",
     label: "Telemetry",
     orderNumber: 60,
   }),
diff --git a/src/features/preferences/renderer/preference-items/terminal/terminal-preference-tab.injectable.ts b/src/features/preferences/renderer/preference-items/terminal/terminal-preference-tab.injectable.ts
index 39e3814c3a..ec4a69619b 100644
--- a/src/features/preferences/renderer/preference-items/terminal/terminal-preference-tab.injectable.ts
+++ b/src/features/preferences/renderer/preference-items/terminal/terminal-preference-tab.injectable.ts
@@ -13,7 +13,6 @@ const terminalPreferenceTabInjectable = getInjectable({
     id: "terminal-tab",
     pathId: "terminal",
     parentId: "general-tab-group" as const,
-    testId: "terminal-preferences-page",
     label: "Terminal",
     orderNumber: 50,
   }),
diff --git a/src/features/preferences/renderer/preference-navigation/preferences-navigation-tab.tsx b/src/features/preferences/renderer/preference-navigation/preferences-navigation-tab.tsx
index 1e4355bbd5..1ee75298d0 100644
--- a/src/features/preferences/renderer/preference-navigation/preferences-navigation-tab.tsx
+++ b/src/features/preferences/renderer/preference-navigation/preferences-navigation-tab.tsx
@@ -23,7 +23,6 @@ interface PreferenceNavigationTabProps {
 const NonInjectedPreferencesNavigationTab = observer(({ navigateToTab, tabIsActive, tab } : Dependencies & PreferenceNavigationTabProps) => (
   <Tab
     onClick={() => navigateToTab(tab.pathId)}
-    data-testid={tab.testId}
     active={tabIsActive.get()}
     label={tab.label}
     data-preference-tab-link-test={tab.pathId}