diff --git a/src/main/getDiForUnitTesting.ts b/src/main/getDiForUnitTesting.ts
index b677455713..86e3df7df3 100644
--- a/src/main/getDiForUnitTesting.ts
+++ b/src/main/getDiForUnitTesting.ts
@@ -104,6 +104,8 @@ import focusApplicationInjectable from "./electron-app/features/focus-applicatio
 import getValidCwdInjectable from "./shell-session/get-valid-cwd.injectable";
 import getCachedShellEnvInjectable from "./shell-session/get-cached-shell-env.injectable";
 import spawnPtyInjectable from "./shell-session/spawn-pty.injectable";
+import isProductionInjectable from "../common/vars/is-production.injectable";
+import isTestEnvInjectable from "../common/vars/is-test-env.injectable";
 
 export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {}) {
   const {
@@ -127,6 +129,9 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {})
   di.preventSideEffects();
 
   if (doGeneralOverrides) {
+    di.override(isProductionInjectable, () => false);
+    di.override(isDevelopmentInjectable, () => false);
+    di.override(isTestEnvInjectable, () => true);
     di.override(electronInjectable, () => ({}));
     di.override(waitUntilBundledExtensionsAreLoadedInjectable, () => async () => {});
     di.override(getRandomIdInjectable, () => () => "some-irrelevant-random-id");
@@ -146,7 +151,6 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {})
     overrideRunnablesHavingSideEffects(di);
     overrideElectronFeatures(di);
 
-    di.override(isDevelopmentInjectable, () => false);
     di.override(environmentVariablesInjectable, () => ({}));
     di.override(commandLineArgumentsInjectable, () => []);
 
diff --git a/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap b/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap
index 6b59eeb03e..55c03d9fb2 100644
--- a/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap
+++ b/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap
@@ -372,6 +372,7 @@ exports[`<ClusterFrame /> given cluster with list nodes and namespaces permissio
             >
               <div
                 class="Tab flex gaps align-center DockTab TerminalTab active"
+                data-testid="dock-tab-0"
                 id="tab-terminal"
                 role="tab"
                 tabindex="0"
@@ -852,6 +853,7 @@ exports[`<ClusterFrame /> given cluster with list nodes and namespaces permissio
             >
               <div
                 class="Tab flex gaps align-center DockTab TerminalTab active"
+                data-testid="dock-tab-0"
                 id="tab-terminal"
                 role="tab"
                 tabindex="0"
@@ -1388,6 +1390,7 @@ exports[`<ClusterFrame /> given cluster without list nodes, but with namespaces
             >
               <div
                 class="Tab flex gaps align-center DockTab TerminalTab active"
+                data-testid="dock-tab-0"
                 id="tab-terminal"
                 role="tab"
                 tabindex="0"
diff --git a/src/renderer/getDiForUnitTesting.tsx b/src/renderer/getDiForUnitTesting.tsx
index 4e9e9cd4c6..403df3a8b9 100644
--- a/src/renderer/getDiForUnitTesting.tsx
+++ b/src/renderer/getDiForUnitTesting.tsx
@@ -70,6 +70,9 @@ import kubeconfigDialogClusterFrameChildComponentInjectable from "./components/k
 import portForwardDialogClusterFrameChildComponentInjectable from "./port-forward/port-forward-dialog-cluster-frame-child-component.injectable";
 import setupSystemCaInjectable from "./frames/root-frame/setup-system-ca.injectable";
 import allowTerminalTransparencyInjectable from "./components/dock/terminal/allow-transparency.injectable";
+import isProductionInjectable from "../common/vars/is-production.injectable";
+import isDevelopmentInjectable from "../common/vars/is-development.injectable";
+import isTestEnvInjectable from "../common/vars/is-test-env.injectable";
 
 export const getDiForUnitTesting = (opts: { doGeneralOverrides?: boolean } = {}) => {
   const {
@@ -93,6 +96,9 @@ export const getDiForUnitTesting = (opts: { doGeneralOverrides?: boolean } = {})
   di.preventSideEffects();
 
   if (doGeneralOverrides) {
+    di.override(isProductionInjectable, () => false);
+    di.override(isDevelopmentInjectable, () => false);
+    di.override(isTestEnvInjectable, () => true);
     di.override(getRandomIdInjectable, () => () => "some-irrelevant-random-id");
     di.override(platformInjectable, () => "darwin");
     di.override(startTopbarStateSyncInjectable, () => ({
diff --git a/src/techincal/shell-sessions/__snapshots__/local.test.ts.snap b/src/techincal/shell-sessions/__snapshots__/local.test.ts.snap
index e396bd7a10..3ee663f9d0 100644
--- a/src/techincal/shell-sessions/__snapshots__/local.test.ts.snap
+++ b/src/techincal/shell-sessions/__snapshots__/local.test.ts.snap
@@ -465,7 +465,7 @@ exports[`local shell session techincal tests renders 1`] = `
               >
                 <i
                   class="Icon new-dock-tab material interactive focusable"
-                  id="menu_actions_14"
+                  id="menu-actions-for-dock"
                   tabindex="0"
                 >
                   <span
@@ -479,7 +479,7 @@ exports[`local shell session techincal tests renders 1`] = `
               </div>
               <i
                 class="Icon material interactive focusable"
-                id="tooltip_target_16"
+                id="tooltip_target_15"
                 tabindex="0"
               >
                 <span
@@ -492,7 +492,7 @@ exports[`local shell session techincal tests renders 1`] = `
               </i>
               <i
                 class="Icon material interactive focusable"
-                id="tooltip_target_17"
+                id="tooltip_target_16"
                 tabindex="0"
               >
                 <span