diff --git a/.github/workflows/_test-unit-base.yml b/.github/workflows/_test-unit-base.yml
index db668536625..d4e9a65e7c0 100644
--- a/.github/workflows/_test-unit-base.yml
+++ b/.github/workflows/_test-unit-base.yml
@@ -130,18 +130,17 @@ jobs:
       - name: Install dependencies
         if: steps.changes.outputs.decision != 'skip'
         timeout-minutes: 8
+        env:
+          LEGACY_MCP_PEER: ${{ inputs.legacy-mcp-peer }}
         run: |
           diff -u model_prices_and_context_window.json litellm/model_prices_and_context_window_backup.json
           .github/scripts/uv_sync_with_retries.sh --frozen --group ci --group proxy-dev --extra google --extra proxy --extra semantic-router --extra saml
           uv run --no-sync python -c 'import os, sys; print(sys.version); assert f"{sys.version_info.major}.{sys.version_info.minor}" == os.environ["UV_PYTHON"]'
-
-      - name: Install the unchanged SDK1 peer
-        if: steps.changes.outputs.decision != 'skip' && inputs.legacy-mcp-peer
-        timeout-minutes: 3
-        run: |
-          uv venv --python "${UV_PYTHON}" .venv-mcp-peer
-          uv pip install --python .venv-mcp-peer 'mcp==1.28.1' 'langchain-mcp-adapters==0.2.1'
-          echo "MCP_TEST_PEER_PYTHON=$GITHUB_WORKSPACE/.venv-mcp-peer/bin/python" >> "$GITHUB_ENV"
+          if [ "$LEGACY_MCP_PEER" = "true" ]; then
+            uv venv --python "${UV_PYTHON}" .venv-mcp-peer
+            uv pip install --python .venv-mcp-peer 'mcp==1.28.1' 'langchain-mcp-adapters==0.2.1'
+            echo "MCP_TEST_PEER_PYTHON=$GITHUB_WORKSPACE/.venv-mcp-peer/bin/python" >> "$GITHUB_ENV"
+          fi
 
       - name: Cache Prisma binaries
         if: steps.changes.outputs.decision != 'skip'
diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
index 55c342caf00..aa82a0bf3ee 100644
--- a/.github/workflows/test-unit.yml
+++ b/.github/workflows/test-unit.yml
@@ -55,7 +55,7 @@ jobs:
             workers: 2
             reruns: 0
             timeout-minutes: 20
-            job-timeout-minutes: 65
+            job-timeout-minutes: 60
 
           - shard: core-utils
             artifact-name: core-utils