diff --git a/.circleci/config.yml b/.circleci/config.yml
index 995480f8784..835f780b9a5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3213,6 +3213,8 @@ jobs:
     resource_class: large
     working_directory: ~/project
     parallelism: << parameters.parallelism >>
+    environment:
+      MCP_CONFORMANCE_CODECOV_FLAG: mcp-conformance
     steps:
       - setup_litellm_test_deps
       - when:
@@ -3266,7 +3268,7 @@ jobs:
           steps:
             - codecov/upload:
                 file: test-results/integration-mcp/conformance-coverage.xml
-                flags: mcp-conformance
+                flags: MCP_CONFORMANCE_CODECOV_FLAG
       - run:
           name: Stop owned database and Redis
           when: always
@@ -3276,8 +3278,18 @@ jobs:
             docker logs redis-cache > test-results/services-<< parameters.suite >>-<< parameters.mode >>/redis.log 2>&1 || true
             docker rm -f postgres-db redis-cache
             test -z "$(docker ps -aq --filter name=postgres-db --filter name=redis-cache)"
-      - store_test_results:
-          path: test-results
+      - when:
+          condition:
+            equal: [mcp, << parameters.suite >>]
+          steps:
+            - store_test_results:
+                path: test-results/integration-mcp/junit.xml
+      - unless:
+          condition:
+            equal: [mcp, << parameters.suite >>]
+          steps:
+            - store_test_results:
+                path: test-results
       - store_artifacts:
           path: test-results