diff --git a/src/jest.setup.ts b/src/jest.setup.ts
index c2f151ff76..eb1e801f72 100644
--- a/src/jest.setup.ts
+++ b/src/jest.setup.ts
@@ -48,10 +48,15 @@ global.ResizeObserver = class {
 jest.mock("./renderer/components/monaco-editor/monaco-editor");
 jest.mock("./renderer/components/tooltip/withTooltip");
 
-const getInjectables = (environment: "renderer" | "main", filePathGlob: string) =>
-  glob.sync(`./{common,extensions,${environment}}/**/${filePathGlob}`, {
+const getInjectables = (environment: "renderer" | "main", filePathGlob: string) => [
+  ...glob.sync(`./{common,extensions,${environment}}/**/${filePathGlob}`, {
     cwd: __dirname,
-  }).map(x => path.resolve(__dirname, x));
+  }),
+
+  ...glob.sync(`./features/**/{${environment},common}/**/${filePathGlob}`, {
+    cwd: __dirname,
+  }),
+].map(x => path.resolve(__dirname, x));
 
 (global as any).rendererInjectablePaths = getInjectables("renderer", "*.injectable.{ts,tsx}");
 (global as any).rendererGlobalOverridePaths = getInjectables("renderer", "*.global-override-for-injectable.{ts,tsx}");
diff --git a/src/main/getDi.ts b/src/main/getDi.ts
index ac7dffe12b..ded33e9e0f 100644
--- a/src/main/getDi.ts
+++ b/src/main/getDi.ts
@@ -18,6 +18,7 @@ export const getDi = () => {
       require.context("./", true, /\.injectable\.(ts|tsx)$/),
       require.context("../extensions", true, /\.injectable\.(ts|tsx)$/),
       require.context("../common", true, /\.injectable\.(ts|tsx)$/),
+      require.context("../features", true, /.*\/(main|common)\/.*\.injectable\.(ts|tsx)$/),
     ],
   });
 
diff --git a/src/renderer/getDi.tsx b/src/renderer/getDi.tsx
index 3380d25c06..632b651547 100644
--- a/src/renderer/getDi.tsx
+++ b/src/renderer/getDi.tsx
@@ -19,6 +19,7 @@ export const getDi = () => {
       require.context("./", true, /\.injectable\.(ts|tsx)$/),
       require.context("../common", true, /\.injectable\.(ts|tsx)$/),
       require.context("../extensions", true, /\.injectable\.(ts|tsx)$/),
+      require.context("../features", true, /.*\/(renderer|common)\/.*\.injectable\.(ts|tsx)$/),
     ],
   });