diff --git a/src/main/getDiForUnitTesting.ts b/src/main/getDiForUnitTesting.ts
index e112ec9c21..8bff8a17db 100644
--- a/src/main/getDiForUnitTesting.ts
+++ b/src/main/getDiForUnitTesting.ts
@@ -5,8 +5,7 @@
 
 import { kebabCase, noop, chunk } from "lodash/fp";
 import type { DiContainer, Injectable } from "@ogre-tools/injectable";
-// @ts-ignore
-import { createContainer, injectableSymbol } from "@ogre-tools/injectable";
+import { createContainer, isInjectable } from "@ogre-tools/injectable";
 import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
 import writeJsonFileInjectable from "../common/fs/write-json-file.injectable";
 import readJsonFileInjectable from "../common/fs/read-json-file.injectable";
@@ -100,7 +99,7 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {})
     global as any
   ).mainInjectablePaths.flatMap((filePath: string) =>
     Object.values(require(filePath)).filter(
-      (maybeInjectable: any) => maybeInjectable.aliasType === injectableSymbol,
+      (maybeInjectable: any) => isInjectable(maybeInjectable),
     ),
   );
 
diff --git a/src/renderer/getDiForUnitTesting.tsx b/src/renderer/getDiForUnitTesting.tsx
index 2afd522518..07e69d65af 100644
--- a/src/renderer/getDiForUnitTesting.tsx
+++ b/src/renderer/getDiForUnitTesting.tsx
@@ -5,9 +5,7 @@
 
 import { noop, chunk } from "lodash/fp";
 import type { DiContainer, Injectable } from "@ogre-tools/injectable";
-import {
-  createContainer,
-} from "@ogre-tools/injectable";
+import { createContainer, isInjectable } from "@ogre-tools/injectable";
 import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
 import requestFromChannelInjectable from "./utils/channel/request-from-channel.injectable";
 import loggerInjectable from "../common/logger.injectable";
@@ -68,9 +66,11 @@ export const getDiForUnitTesting = (
   setLegacyGlobalDiForExtensionApi(di, Environments.renderer);
 
   const injectables: Injectable<any, any, any>[] = (
-      global as any
-  ).rendererInjectablePaths.map(
-    (filePath: string) => require(filePath).default,
+    global as any
+  ).rendererInjectablePaths.flatMap((filePath: string) =>
+    Object.values(require(filePath)).filter(
+      (maybeInjectable: any) => isInjectable(maybeInjectable),
+    ),
   );
 
   runInAction(() => {