diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0e16053f233..6e0d4d6dc54 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -119,7 +119,7 @@ jobs:
           username: ${DOCKERHUB_USERNAME}
           password: ${DOCKERHUB_PASSWORD}
     working_directory: ~/project
-
+    parallelism: 4
     steps:
       - checkout
       - setup_google_dns
@@ -209,10 +209,25 @@ jobs:
           command: |
             pwd
             ls
-            # Add --timeout to kill hanging tests after 300s (5 min)
-            # Add -v to show test names as they run for debugging
-            # Add --tb=short for shorter tracebacks
-            python -m pytest -vv tests/local_testing --cov=litellm --cov-report=xml --junitxml=test-results/junit.xml --durations=20 -k "not test_python_38.py and not test_basic_python_version.py and not router and not assistants and not langfuse and not caching and not cache" -n 4 --timeout=300 --timeout_method=thread
+            mkdir -p test-results
+
+            # Discover test files
+            TEST_FILES=$(circleci tests glob "tests/local_testing/**/test_*.py")
+
+            echo "$TEST_FILES" | circleci tests run \
+              --split-by=timings \
+              --timings-type=filename \
+              --verbose \
+              --command="xargs python -m pytest \
+                -vv \
+                tests/local_testing \
+                --cov=litellm \
+                --cov-report=xml \
+                --junitxml=test-results/junit.xml \
+                --durations=20 \
+                -k \"not test_python_38.py and not test_basic_python_version.py and not router and not assistants and not langfuse and not caching and not cache\" \
+                --timeout=300 \
+                --timeout_method=thread"
           no_output_timeout: 120m
       - run:
           name: Rename the coverage files
@@ -528,7 +543,7 @@ jobs:
 
             echo "$TEST_FILES" | circleci tests run \
               --split-by=timings \
-              --timings-type=filename \
+              --timings-type=file \
               --verbose \
               --command="xargs python -m pytest \
                 -k 'router' \
@@ -1786,7 +1801,7 @@ jobs:
           username: ${DOCKERHUB_USERNAME}
           password: ${DOCKERHUB_PASSWORD}
     working_directory: ~/project
-
+    parallelism: 4
     steps:
       - checkout
       - setup_google_dns
@@ -1813,7 +1828,23 @@ jobs:
           command: |
             pwd
             ls
-            python -m pytest -vv tests/logging_callback_tests --cov=litellm --cov-report=xml -s -v --junitxml=test-results/junit.xml --durations=5
+            mkdir -p test-results
+
+            # Discover logging callback test files
+            TEST_FILES=$(circleci tests glob "tests/logging_callback_tests/**/test_*.py")
+
+            echo "$TEST_FILES" | circleci tests run \
+              --split-by=timings \
+              --timings-type=filename \
+              --verbose \
+              --command="xargs python -m pytest \
+                -vv \
+                tests/logging_callback_tests \
+                --cov=litellm \
+                --cov-report=xml \
+                -s \
+                --junitxml=test-results/junit.xml \
+                --durations=5"
           no_output_timeout: 120m
       - run:
           name: Rename the coverage files