diff --git a/src/common/__tests__/cluster-store.test.ts b/src/common/__tests__/cluster-store.test.ts
index 4f836d5566..d38cd4c91f 100644
--- a/src/common/__tests__/cluster-store.test.ts
+++ b/src/common/__tests__/cluster-store.test.ts
@@ -363,6 +363,8 @@ users:
 
       mockFs(mockOpts);
 
+      mainDi.override(appVersionInjectable, () => "3.7.0");
+
       createCluster = mainDi.inject(createClusterInjectionToken);
 
       clusterStore = mainDi.inject(clusterStoreInjectable);
diff --git a/src/common/__tests__/user-store.test.ts b/src/common/__tests__/user-store.test.ts
index 042b6363f7..238fc5bce8 100644
--- a/src/common/__tests__/user-store.test.ts
+++ b/src/common/__tests__/user-store.test.ts
@@ -21,7 +21,7 @@ jest.mock("electron", () => ({
   },
 }));
 
-import { UserStore } from "../user-store";
+import type { UserStore } from "../user-store";
 import { Console } from "console";
 import { SemVer } from "semver";
 import electron from "electron";
@@ -49,14 +49,15 @@ describe("user store tests", () => {
 
     di.override(writeFileInjectable, () => () => Promise.resolve());
     di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
-    di.override(userStoreInjectable, () => UserStore.createInstance());
-
     di.permitSideEffects(getConfigurationFileModelInjectable);
+
     di.permitSideEffects(appVersionInjectable);
+    di.permitSideEffects(userStoreInjectable);
+
+    di.unoverride(userStoreInjectable);
   });
 
   afterEach(() => {
-    UserStore.resetInstance();
     mockFs.restore();
   });
 
@@ -126,6 +127,8 @@ describe("user store tests", () => {
         },
       });
 
+      di.override(appVersionInjectable, () => "10.0.0");
+
       userStore = di.inject(userStoreInjectable);
     });