diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 26e0c84..d90ccb8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,20 +38,22 @@ jobs:
           ANTHROPIC_API_KEY: test-key-for-ci
           AD_BUYER_SRC_PATH: ${{ github.workspace }}/buyer-agent/src
           CREWAI_TELEMETRY_OPT_OUT: "true"
+          CREWAI_DISABLE_TELEMETRY: "true"
+          CREWAI_DISABLE_TRACKING: "true"
           LITELLM_TELEMETRY: "False"
-        run: |
-          set +e
-          timeout --kill-after=10s 60s pytest tests/unit/ -v --tb=short
-          code=$?
-          ([ $code -eq 124 ] || [ $code -eq 137 ]) && exit 0 || exit $code
+          OTEL_SDK_DISABLED: "true"
+          ANONYMIZED_TELEMETRY: "False"
+          POSTHOG_DISABLED: "1"
+        run: timeout --kill-after=10s 600s pytest tests/unit/ -v --tb=short --timeout=30 --timeout-method=thread
 
       - name: Integration tests
         env:
           ANTHROPIC_API_KEY: test-key-for-ci
           CREWAI_TELEMETRY_OPT_OUT: "true"
+          CREWAI_DISABLE_TELEMETRY: "true"
+          CREWAI_DISABLE_TRACKING: "true"
           LITELLM_TELEMETRY: "False"
-        run: |
-          set +e
-          timeout --kill-after=10s 120s pytest tests/integration/ -v --tb=short
-          code=$?
-          ([ $code -eq 124 ] || [ $code -eq 137 ]) && exit 0 || exit $code
+          OTEL_SDK_DISABLED: "true"
+          ANONYMIZED_TELEMETRY: "False"
+          POSTHOG_DISABLED: "1"
+        run: timeout --kill-after=10s 600s pytest tests/integration/ -v --tb=short --timeout=60 --timeout-method=thread
diff --git a/pyproject.toml b/pyproject.toml
index 9251f26..8afdfde 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -49,6 +49,7 @@ dev = [
     "pytest>=8.0.0",
     "pytest-asyncio>=0.24.0",
     "pytest-cov>=5.0.0",
+    "pytest-timeout>=2.3.0",
     "ruff>=0.6.0",
     "mypy>=1.11.0",
 ]