diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
index df477b4883a..c32823f426f 100644
--- a/.github/codeql/codeql-config.yml
+++ b/.github/codeql/codeql-config.yml
@@ -1,7 +1,6 @@
 name: "CodeQL Config"
 
-# Exclude paths to reduce disk space usage during CodeQL analysis
-# This prevents analyzing unnecessary files that consume disk space
+# Exclude paths to reduce disk space usage and improve analysis performance
 paths-ignore:
   # Dependencies - don't analyze third-party code
   - "**/node_modules"
@@ -16,6 +15,22 @@ paths-ignore:
   - "**/www"
   - "**/release"
   
+  # Test files - exclude test code to improve performance
+  - "**/*.test.ts"
+  - "**/*.test.tsx"
+  - "**/*.spec.ts"
+  - "**/*.spec.tsx"
+  - "**/*.test.js"
+  - "**/*.test.jsx"
+  - "**/*.spec.js"
+  - "**/*.spec.jsx"
+  
+  # Storybook files
+  - "**/*.stories.tsx"
+  - "**/*.stories.ts"
+  - "**/*.stories.jsx"
+  - "**/*.stories.js"
+  
   # Test fixtures and snapshots
   - "**/__mocks__"
   - "**/__image_snapshots__"
@@ -26,6 +41,16 @@ paths-ignore:
   - "**/test/**/*.svg"
   - "**/integration-tests/**/*.png"
   
+  # Test utilities and configs
+  - "**/test-utils/**"
+  - "**/testing/**"
+  - "**/jest.config.*"
+  - "**/jest.setup.*"
+  - "**/coverage/**"
+  
+  # Generated type definition files
+  - "**/*.d.ts"
+  
   # Example and playground files - not production code
   - "**/example"
   - "**/examples"
@@ -38,7 +63,7 @@ paths-ignore:
   - "**/*.min.js"
   - "**/*.min.css"
   
-  # Large standalone packages - exclude website and release directories
+  # Large standalone packages
   - "standalone-packages/monaco-editor/website"
   - "standalone-packages/monaco-editor/release"
   - "standalone-packages/vscode-editor/release"
@@ -53,3 +78,4 @@ paths-ignore:
   # CI/CD files
   - "**/Dockerfile*"
   - "**/.circleci"
+
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 5e1e3aa8d9c..527063f12fd 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -12,6 +12,7 @@ jobs:
   analyze:
     name: Analyze (${{ matrix.language }})
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     permissions:
       # required for all workflows
       security-events: write