diff --git a/.circleci/config.yml b/.circleci/config.yml
index fca7cf2fa91..f4b6d2b6b47 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2372,6 +2372,10 @@ jobs:
             export LITELLM_PROXY_API_KEY="sk-1234"
             mkdir -p test-results
             uv run --no-sync python -m pytest -vv tests/claude_code/ \
+              --ignore=tests/claude_code/_driver_unit_tests \
+              --ignore=tests/claude_code/_builder_unit_tests \
+              --ignore=tests/claude_code/_publisher_unit_tests \
+              --ignore=tests/claude_code/_pr_gate_unit_tests \
               --junitxml=test-results/junit.xml \
               --durations=10
           no_output_timeout: 30m
diff --git a/tests/claude_code/conftest.py b/tests/claude_code/conftest.py
index 89bf5bfc529..f819b85a4dd 100644
--- a/tests/claude_code/conftest.py
+++ b/tests/claude_code/conftest.py
@@ -450,6 +450,7 @@ def pytest_sessionstart(session):
        the controller while it's wiping the directory.
     """
     _COLLECTOR.items.clear()
+    _manifest_feature_ids.cache_clear()
 
     if _is_xdist_worker(session):
         return