diff --git a/.changeset/funny-lamps-turn.md b/.changeset/funny-lamps-turn.md
new file mode 100644
index 0000000000..9db340885e
--- /dev/null
+++ b/.changeset/funny-lamps-turn.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Extended lint rule to prevents imports of stories or tests from production code.
diff --git a/packages/cli/config/eslint-factory.js b/packages/cli/config/eslint-factory.js
index e04e3bdb2d..e86146048e 100644
--- a/packages/cli/config/eslint-factory.js
+++ b/packages/cli/config/eslint-factory.js
@@ -130,8 +130,14 @@ function createConfig(dir, extraConfig = {}) {
             ...(restrictedImports ?? []),
             ...(restrictedSrcImports ?? []),
           ],
-          // Avoid cross-package imports
-          patterns: ['**/../../**/*/src/**', '**/../../**/*/src'],
+          patterns: [
+            // Avoid cross-package imports
+            '**/../../**/*/src/**',
+            '**/../../**/*/src',
+            // Prevent imports of stories or tests
+            '*.stories*',
+            '*.test*',
+          ],
         },
       ],