diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index ebc070f34..e357f02f2 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -2172,7 +2172,7 @@ axes:
           PYTHON_BINARY: "C:/python/Python313/python.exe"
 
 buildvariants:
-# Server Tests for RHEL8.
+# Server Tests.
 - name: test-rhel8-py3.9-auth-ssl-cov
   tasks:
     - name: .standalone
@@ -2339,8 +2339,6 @@ buildvariants:
     AUTH: auth
     SSL: ssl
     PYTHON_BINARY: /opt/python/pypy3.9/bin/python3
-
-# Server tests for MacOS.
 - name: test-macos-py3.9-auth-ssl-sync
   tasks:
     - name: .standalone
@@ -2351,8 +2349,32 @@ buildvariants:
     AUTH: auth
     SSL: ssl
     TEST_SUITES: default
-    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
     SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
+- name: test-macos-py3.9-noauth-ssl-sync
+  tasks:
+    - name: .standalone
+  display_name: Test macOS py3.9 NoAuth SSL Sync
+  run_on:
+    - macos-14
+  expansions:
+    AUTH: noauth
+    SSL: ssl
+    TEST_SUITES: default
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
+- name: test-macos-py3.9-noauth-nossl-sync
+  tasks:
+    - name: .standalone
+  display_name: Test macOS py3.9 NoAuth NoSSL Sync
+  run_on:
+    - macos-14
+  expansions:
+    AUTH: noauth
+    SSL: nossl
+    TEST_SUITES: default
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
 - name: test-macos-py3.9-auth-ssl-async
   tasks:
     - name: .standalone
@@ -2363,47 +2385,23 @@ buildvariants:
     AUTH: auth
     SSL: ssl
     TEST_SUITES: default_async
+    SKIP_CSOT_TESTS: "true"
     PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
-    SKIP_CSOT_TESTS: "true"
-- name: test-macos-py3.13-noauth-ssl-sync
+- name: test-macos-py3.9-noauth-ssl-async
   tasks:
-    - name: .replica_set
-  display_name: Test macOS py3.13 NoAuth SSL Sync
-  run_on:
-    - macos-14
-  expansions:
-    AUTH: noauth
-    SSL: ssl
-    TEST_SUITES: default
-    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
-    SKIP_CSOT_TESTS: "true"
-- name: test-macos-py3.13-noauth-ssl-async
-  tasks:
-    - name: .replica_set
-  display_name: Test macOS py3.13 NoAuth SSL Async
+    - name: .standalone
+  display_name: Test macOS py3.9 NoAuth SSL Async
   run_on:
     - macos-14
   expansions:
     AUTH: noauth
     SSL: ssl
     TEST_SUITES: default_async
-    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
     SKIP_CSOT_TESTS: "true"
-- name: test-macos-py3.9-noauth-nossl-sync
-  tasks:
-    - name: .sharded_cluster
-  display_name: Test macOS py3.9 NoAuth NoSSL Sync
-  run_on:
-    - macos-14
-  expansions:
-    AUTH: noauth
-    SSL: nossl
-    TEST_SUITES: default
     PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
-    SKIP_CSOT_TESTS: "true"
 - name: test-macos-py3.9-noauth-nossl-async
   tasks:
-    - name: .sharded_cluster
+    - name: .standalone
   display_name: Test macOS py3.9 NoAuth NoSSL Async
   run_on:
     - macos-14
@@ -2411,10 +2409,80 @@ buildvariants:
     AUTH: noauth
     SSL: nossl
     TEST_SUITES: default_async
-    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
     SKIP_CSOT_TESTS: "true"
-
-# Server tests for macOS Arm64.
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
+- name: test-macos-py3.13-auth-ssl-sync
+  tasks:
+    - name: .sharded_cluster
+  display_name: Test macOS py3.13 Auth SSL Sync
+  run_on:
+    - macos-14
+  expansions:
+    AUTH: auth
+    SSL: ssl
+    TEST_SUITES: default
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
+- name: test-macos-py3.13-noauth-ssl-sync
+  tasks:
+    - name: .sharded_cluster
+  display_name: Test macOS py3.13 NoAuth SSL Sync
+  run_on:
+    - macos-14
+  expansions:
+    AUTH: noauth
+    SSL: ssl
+    TEST_SUITES: default
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
+- name: test-macos-py3.13-noauth-nossl-sync
+  tasks:
+    - name: .sharded_cluster
+  display_name: Test macOS py3.13 NoAuth NoSSL Sync
+  run_on:
+    - macos-14
+  expansions:
+    AUTH: noauth
+    SSL: nossl
+    TEST_SUITES: default
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
+- name: test-macos-py3.13-auth-ssl-async
+  tasks:
+    - name: .sharded_cluster
+  display_name: Test macOS py3.13 Auth SSL Async
+  run_on:
+    - macos-14
+  expansions:
+    AUTH: auth
+    SSL: ssl
+    TEST_SUITES: default_async
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
+- name: test-macos-py3.13-noauth-ssl-async
+  tasks:
+    - name: .sharded_cluster
+  display_name: Test macOS py3.13 NoAuth SSL Async
+  run_on:
+    - macos-14
+  expansions:
+    AUTH: noauth
+    SSL: ssl
+    TEST_SUITES: default_async
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
+- name: test-macos-py3.13-noauth-nossl-async
+  tasks:
+    - name: .sharded_cluster
+  display_name: Test macOS py3.13 NoAuth NoSSL Async
+  run_on:
+    - macos-14
+  expansions:
+    AUTH: noauth
+    SSL: nossl
+    TEST_SUITES: default_async
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
 - name: test-macos-arm64-py3.9-auth-ssl-sync
   tasks:
     - name: .standalone .6.0
@@ -2431,6 +2499,38 @@ buildvariants:
     TEST_SUITES: default
     SKIP_CSOT_TESTS: "true"
     PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
+- name: test-macos-arm64-py3.9-noauth-ssl-sync
+  tasks:
+    - name: .standalone .6.0
+    - name: .standalone .7.0
+    - name: .standalone .8.0
+    - name: .standalone .rapid
+    - name: .standalone .latest
+  display_name: Test macOS Arm64 py3.9 NoAuth SSL Sync
+  run_on:
+    - macos-14-arm64
+  expansions:
+    AUTH: noauth
+    SSL: ssl
+    TEST_SUITES: default
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
+- name: test-macos-arm64-py3.9-noauth-nossl-sync
+  tasks:
+    - name: .standalone .6.0
+    - name: .standalone .7.0
+    - name: .standalone .8.0
+    - name: .standalone .rapid
+    - name: .standalone .latest
+  display_name: Test macOS Arm64 py3.9 NoAuth NoSSL Sync
+  run_on:
+    - macos-14-arm64
+  expansions:
+    AUTH: noauth
+    SSL: nossl
+    TEST_SUITES: default
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
 - name: test-macos-arm64-py3.9-auth-ssl-async
   tasks:
     - name: .standalone .6.0
@@ -2447,30 +2547,14 @@ buildvariants:
     TEST_SUITES: default_async
     SKIP_CSOT_TESTS: "true"
     PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
-- name: test-macos-arm64-py3.13-noauth-ssl-sync
+- name: test-macos-arm64-py3.9-noauth-ssl-async
   tasks:
-    - name: .replica_set .6.0
-    - name: .replica_set .7.0
-    - name: .replica_set .8.0
-    - name: .replica_set .rapid
-    - name: .replica_set .latest
-  display_name: Test macOS Arm64 py3.13 NoAuth SSL Sync
-  run_on:
-    - macos-14-arm64
-  expansions:
-    AUTH: noauth
-    SSL: ssl
-    TEST_SUITES: default
-    SKIP_CSOT_TESTS: "true"
-    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
-- name: test-macos-arm64-py3.13-noauth-ssl-async
-  tasks:
-    - name: .replica_set .6.0
-    - name: .replica_set .7.0
-    - name: .replica_set .8.0
-    - name: .replica_set .rapid
-    - name: .replica_set .latest
-  display_name: Test macOS Arm64 py3.13 NoAuth SSL Async
+    - name: .standalone .6.0
+    - name: .standalone .7.0
+    - name: .standalone .8.0
+    - name: .standalone .rapid
+    - name: .standalone .latest
+  display_name: Test macOS Arm64 py3.9 NoAuth SSL Async
   run_on:
     - macos-14-arm64
   expansions:
@@ -2478,30 +2562,14 @@ buildvariants:
     SSL: ssl
     TEST_SUITES: default_async
     SKIP_CSOT_TESTS: "true"
-    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
-- name: test-macos-arm64-py3.9-noauth-nossl-sync
-  tasks:
-    - name: .sharded_cluster .6.0
-    - name: .sharded_cluster .7.0
-    - name: .sharded_cluster .8.0
-    - name: .sharded_cluster .rapid
-    - name: .sharded_cluster .latest
-  display_name: Test macOS Arm64 py3.9 NoAuth NoSSL Sync
-  run_on:
-    - macos-14-arm64
-  expansions:
-    AUTH: noauth
-    SSL: nossl
-    TEST_SUITES: default
-    SKIP_CSOT_TESTS: "true"
     PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
 - name: test-macos-arm64-py3.9-noauth-nossl-async
   tasks:
-    - name: .sharded_cluster .6.0
-    - name: .sharded_cluster .7.0
-    - name: .sharded_cluster .8.0
-    - name: .sharded_cluster .rapid
-    - name: .sharded_cluster .latest
+    - name: .standalone .6.0
+    - name: .standalone .7.0
+    - name: .standalone .8.0
+    - name: .standalone .rapid
+    - name: .standalone .latest
   display_name: Test macOS Arm64 py3.9 NoAuth NoSSL Async
   run_on:
     - macos-14-arm64
@@ -2511,8 +2579,102 @@ buildvariants:
     TEST_SUITES: default_async
     SKIP_CSOT_TESTS: "true"
     PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
-
-# Server tests for Windows.
+- name: test-macos-arm64-py3.13-auth-ssl-sync
+  tasks:
+    - name: .sharded_cluster .6.0
+    - name: .sharded_cluster .7.0
+    - name: .sharded_cluster .8.0
+    - name: .sharded_cluster .rapid
+    - name: .sharded_cluster .latest
+  display_name: Test macOS Arm64 py3.13 Auth SSL Sync
+  run_on:
+    - macos-14-arm64
+  expansions:
+    AUTH: auth
+    SSL: ssl
+    TEST_SUITES: default
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
+- name: test-macos-arm64-py3.13-noauth-ssl-sync
+  tasks:
+    - name: .sharded_cluster .6.0
+    - name: .sharded_cluster .7.0
+    - name: .sharded_cluster .8.0
+    - name: .sharded_cluster .rapid
+    - name: .sharded_cluster .latest
+  display_name: Test macOS Arm64 py3.13 NoAuth SSL Sync
+  run_on:
+    - macos-14-arm64
+  expansions:
+    AUTH: noauth
+    SSL: ssl
+    TEST_SUITES: default
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
+- name: test-macos-arm64-py3.13-noauth-nossl-sync
+  tasks:
+    - name: .sharded_cluster .6.0
+    - name: .sharded_cluster .7.0
+    - name: .sharded_cluster .8.0
+    - name: .sharded_cluster .rapid
+    - name: .sharded_cluster .latest
+  display_name: Test macOS Arm64 py3.13 NoAuth NoSSL Sync
+  run_on:
+    - macos-14-arm64
+  expansions:
+    AUTH: noauth
+    SSL: nossl
+    TEST_SUITES: default
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
+- name: test-macos-arm64-py3.13-auth-ssl-async
+  tasks:
+    - name: .sharded_cluster .6.0
+    - name: .sharded_cluster .7.0
+    - name: .sharded_cluster .8.0
+    - name: .sharded_cluster .rapid
+    - name: .sharded_cluster .latest
+  display_name: Test macOS Arm64 py3.13 Auth SSL Async
+  run_on:
+    - macos-14-arm64
+  expansions:
+    AUTH: auth
+    SSL: ssl
+    TEST_SUITES: default_async
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
+- name: test-macos-arm64-py3.13-noauth-ssl-async
+  tasks:
+    - name: .sharded_cluster .6.0
+    - name: .sharded_cluster .7.0
+    - name: .sharded_cluster .8.0
+    - name: .sharded_cluster .rapid
+    - name: .sharded_cluster .latest
+  display_name: Test macOS Arm64 py3.13 NoAuth SSL Async
+  run_on:
+    - macos-14-arm64
+  expansions:
+    AUTH: noauth
+    SSL: ssl
+    TEST_SUITES: default_async
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
+- name: test-macos-arm64-py3.13-noauth-nossl-async
+  tasks:
+    - name: .sharded_cluster .6.0
+    - name: .sharded_cluster .7.0
+    - name: .sharded_cluster .8.0
+    - name: .sharded_cluster .rapid
+    - name: .sharded_cluster .latest
+  display_name: Test macOS Arm64 py3.13 NoAuth NoSSL Async
+  run_on:
+    - macos-14-arm64
+  expansions:
+    AUTH: noauth
+    SSL: nossl
+    TEST_SUITES: default_async
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
 - name: test-win64-py3.9-auth-ssl-sync
   tasks:
     - name: .standalone
@@ -2523,8 +2685,32 @@ buildvariants:
     AUTH: auth
     SSL: ssl
     TEST_SUITES: default
-    PYTHON_BINARY: C:/python/Python39/python.exe
     SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: C:/python/Python39/python.exe
+- name: test-win64-py3.9-noauth-ssl-sync
+  tasks:
+    - name: .standalone
+  display_name: Test Win64 py3.9 NoAuth SSL Sync
+  run_on:
+    - windows-64-vsMulti-small
+  expansions:
+    AUTH: noauth
+    SSL: ssl
+    TEST_SUITES: default
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: C:/python/Python39/python.exe
+- name: test-win64-py3.9-noauth-nossl-sync
+  tasks:
+    - name: .standalone
+  display_name: Test Win64 py3.9 NoAuth NoSSL Sync
+  run_on:
+    - windows-64-vsMulti-small
+  expansions:
+    AUTH: noauth
+    SSL: nossl
+    TEST_SUITES: default
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: C:/python/Python39/python.exe
 - name: test-win64-py3.9-auth-ssl-async
   tasks:
     - name: .standalone
@@ -2535,47 +2721,23 @@ buildvariants:
     AUTH: auth
     SSL: ssl
     TEST_SUITES: default_async
+    SKIP_CSOT_TESTS: "true"
     PYTHON_BINARY: C:/python/Python39/python.exe
-    SKIP_CSOT_TESTS: "true"
-- name: test-win64-py3.13-noauth-ssl-sync
+- name: test-win64-py3.9-noauth-ssl-async
   tasks:
-    - name: .replica_set
-  display_name: Test Win64 py3.13 NoAuth SSL Sync
-  run_on:
-    - windows-64-vsMulti-small
-  expansions:
-    AUTH: noauth
-    SSL: ssl
-    TEST_SUITES: default
-    PYTHON_BINARY: C:/python/Python313/python.exe
-    SKIP_CSOT_TESTS: "true"
-- name: test-win64-py3.13-noauth-ssl-async
-  tasks:
-    - name: .replica_set
-  display_name: Test Win64 py3.13 NoAuth SSL Async
+    - name: .standalone
+  display_name: Test Win64 py3.9 NoAuth SSL Async
   run_on:
     - windows-64-vsMulti-small
   expansions:
     AUTH: noauth
     SSL: ssl
     TEST_SUITES: default_async
-    PYTHON_BINARY: C:/python/Python313/python.exe
     SKIP_CSOT_TESTS: "true"
-- name: test-win64-py3.9-noauth-nossl-sync
-  tasks:
-    - name: .sharded_cluster
-  display_name: Test Win64 py3.9 NoAuth NoSSL Sync
-  run_on:
-    - windows-64-vsMulti-small
-  expansions:
-    AUTH: noauth
-    SSL: nossl
-    TEST_SUITES: default
     PYTHON_BINARY: C:/python/Python39/python.exe
-    SKIP_CSOT_TESTS: "true"
 - name: test-win64-py3.9-noauth-nossl-async
   tasks:
-    - name: .sharded_cluster
+    - name: .standalone
   display_name: Test Win64 py3.9 NoAuth NoSSL Async
   run_on:
     - windows-64-vsMulti-small
@@ -2583,8 +2745,80 @@ buildvariants:
     AUTH: noauth
     SSL: nossl
     TEST_SUITES: default_async
-    PYTHON_BINARY: C:/python/Python39/python.exe
     SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: C:/python/Python39/python.exe
+- name: test-win64-py3.13-auth-ssl-sync
+  tasks:
+    - name: .sharded_cluster
+  display_name: Test Win64 py3.13 Auth SSL Sync
+  run_on:
+    - windows-64-vsMulti-small
+  expansions:
+    AUTH: auth
+    SSL: ssl
+    TEST_SUITES: default
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: C:/python/Python313/python.exe
+- name: test-win64-py3.13-noauth-ssl-sync
+  tasks:
+    - name: .sharded_cluster
+  display_name: Test Win64 py3.13 NoAuth SSL Sync
+  run_on:
+    - windows-64-vsMulti-small
+  expansions:
+    AUTH: noauth
+    SSL: ssl
+    TEST_SUITES: default
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: C:/python/Python313/python.exe
+- name: test-win64-py3.13-noauth-nossl-sync
+  tasks:
+    - name: .sharded_cluster
+  display_name: Test Win64 py3.13 NoAuth NoSSL Sync
+  run_on:
+    - windows-64-vsMulti-small
+  expansions:
+    AUTH: noauth
+    SSL: nossl
+    TEST_SUITES: default
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: C:/python/Python313/python.exe
+- name: test-win64-py3.13-auth-ssl-async
+  tasks:
+    - name: .sharded_cluster
+  display_name: Test Win64 py3.13 Auth SSL Async
+  run_on:
+    - windows-64-vsMulti-small
+  expansions:
+    AUTH: auth
+    SSL: ssl
+    TEST_SUITES: default_async
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: C:/python/Python313/python.exe
+- name: test-win64-py3.13-noauth-ssl-async
+  tasks:
+    - name: .sharded_cluster
+  display_name: Test Win64 py3.13 NoAuth SSL Async
+  run_on:
+    - windows-64-vsMulti-small
+  expansions:
+    AUTH: noauth
+    SSL: ssl
+    TEST_SUITES: default_async
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: C:/python/Python313/python.exe
+- name: test-win64-py3.13-noauth-nossl-async
+  tasks:
+    - name: .sharded_cluster
+  display_name: Test Win64 py3.13 NoAuth NoSSL Async
+  run_on:
+    - windows-64-vsMulti-small
+  expansions:
+    AUTH: noauth
+    SSL: nossl
+    TEST_SUITES: default_async
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: C:/python/Python313/python.exe
 - name: test-win32-py3.9-auth-ssl-sync
   tasks:
     - name: .standalone
@@ -2595,10 +2829,32 @@ buildvariants:
     AUTH: auth
     SSL: ssl
     TEST_SUITES: default
-    PYTHON_BINARY: C:/python/32/Python39/python.exe
     SKIP_CSOT_TESTS: "true"
-
-# Server tests for Win32.
+    PYTHON_BINARY: C:/python/32/Python39/python.exe
+- name: test-win32-py3.9-noauth-ssl-sync
+  tasks:
+    - name: .standalone
+  display_name: Test Win32 py3.9 NoAuth SSL Sync
+  run_on:
+    - windows-64-vsMulti-small
+  expansions:
+    AUTH: noauth
+    SSL: ssl
+    TEST_SUITES: default
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: C:/python/32/Python39/python.exe
+- name: test-win32-py3.9-noauth-nossl-sync
+  tasks:
+    - name: .standalone
+  display_name: Test Win32 py3.9 NoAuth NoSSL Sync
+  run_on:
+    - windows-64-vsMulti-small
+  expansions:
+    AUTH: noauth
+    SSL: nossl
+    TEST_SUITES: default
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: C:/python/32/Python39/python.exe
 - name: test-win32-py3.9-auth-ssl-async
   tasks:
     - name: .standalone
@@ -2609,47 +2865,23 @@ buildvariants:
     AUTH: auth
     SSL: ssl
     TEST_SUITES: default_async
+    SKIP_CSOT_TESTS: "true"
     PYTHON_BINARY: C:/python/32/Python39/python.exe
-    SKIP_CSOT_TESTS: "true"
-- name: test-win32-py3.13-noauth-ssl-sync
+- name: test-win32-py3.9-noauth-ssl-async
   tasks:
-    - name: .replica_set
-  display_name: Test Win32 py3.13 NoAuth SSL Sync
-  run_on:
-    - windows-64-vsMulti-small
-  expansions:
-    AUTH: noauth
-    SSL: ssl
-    TEST_SUITES: default
-    PYTHON_BINARY: C:/python/32/Python313/python.exe
-    SKIP_CSOT_TESTS: "true"
-- name: test-win32-py3.13-noauth-ssl-async
-  tasks:
-    - name: .replica_set
-  display_name: Test Win32 py3.13 NoAuth SSL Async
+    - name: .standalone
+  display_name: Test Win32 py3.9 NoAuth SSL Async
   run_on:
     - windows-64-vsMulti-small
   expansions:
     AUTH: noauth
     SSL: ssl
     TEST_SUITES: default_async
-    PYTHON_BINARY: C:/python/32/Python313/python.exe
     SKIP_CSOT_TESTS: "true"
-- name: test-win32-py3.9-noauth-nossl-sync
-  tasks:
-    - name: .sharded_cluster
-  display_name: Test Win32 py3.9 NoAuth NoSSL Sync
-  run_on:
-    - windows-64-vsMulti-small
-  expansions:
-    AUTH: noauth
-    SSL: nossl
-    TEST_SUITES: default
     PYTHON_BINARY: C:/python/32/Python39/python.exe
-    SKIP_CSOT_TESTS: "true"
 - name: test-win32-py3.9-noauth-nossl-async
   tasks:
-    - name: .sharded_cluster
+    - name: .standalone
   display_name: Test Win32 py3.9 NoAuth NoSSL Async
   run_on:
     - windows-64-vsMulti-small
@@ -2657,8 +2889,80 @@ buildvariants:
     AUTH: noauth
     SSL: nossl
     TEST_SUITES: default_async
-    PYTHON_BINARY: C:/python/32/Python39/python.exe
     SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: C:/python/32/Python39/python.exe
+- name: test-win32-py3.13-auth-ssl-sync
+  tasks:
+    - name: .sharded_cluster
+  display_name: Test Win32 py3.13 Auth SSL Sync
+  run_on:
+    - windows-64-vsMulti-small
+  expansions:
+    AUTH: auth
+    SSL: ssl
+    TEST_SUITES: default
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: C:/python/32/Python313/python.exe
+- name: test-win32-py3.13-noauth-ssl-sync
+  tasks:
+    - name: .sharded_cluster
+  display_name: Test Win32 py3.13 NoAuth SSL Sync
+  run_on:
+    - windows-64-vsMulti-small
+  expansions:
+    AUTH: noauth
+    SSL: ssl
+    TEST_SUITES: default
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: C:/python/32/Python313/python.exe
+- name: test-win32-py3.13-noauth-nossl-sync
+  tasks:
+    - name: .sharded_cluster
+  display_name: Test Win32 py3.13 NoAuth NoSSL Sync
+  run_on:
+    - windows-64-vsMulti-small
+  expansions:
+    AUTH: noauth
+    SSL: nossl
+    TEST_SUITES: default
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: C:/python/32/Python313/python.exe
+- name: test-win32-py3.13-auth-ssl-async
+  tasks:
+    - name: .sharded_cluster
+  display_name: Test Win32 py3.13 Auth SSL Async
+  run_on:
+    - windows-64-vsMulti-small
+  expansions:
+    AUTH: auth
+    SSL: ssl
+    TEST_SUITES: default_async
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: C:/python/32/Python313/python.exe
+- name: test-win32-py3.13-noauth-ssl-async
+  tasks:
+    - name: .sharded_cluster
+  display_name: Test Win32 py3.13 NoAuth SSL Async
+  run_on:
+    - windows-64-vsMulti-small
+  expansions:
+    AUTH: noauth
+    SSL: ssl
+    TEST_SUITES: default_async
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: C:/python/32/Python313/python.exe
+- name: test-win32-py3.13-noauth-nossl-async
+  tasks:
+    - name: .sharded_cluster
+  display_name: Test Win32 py3.13 NoAuth NoSSL Async
+  run_on:
+    - windows-64-vsMulti-small
+  expansions:
+    AUTH: noauth
+    SSL: nossl
+    TEST_SUITES: default_async
+    SKIP_CSOT_TESTS: "true"
+    PYTHON_BINARY: C:/python/32/Python313/python.exe
 
 # Encryption tests.
 - name: encryption-rhel8-py3.9-auth-ssl
@@ -3491,6 +3795,100 @@ buildvariants:
     SSL: ssl
     PYTHON_BINARY: /opt/python/3.13/bin/python3
 
+# AWS Auth tests.
+- name: aws-auth-ubuntu-20-py3.9
+  tasks:
+    - name: aws-auth-test-4.4
+    - name: aws-auth-test-5.0
+    - name: aws-auth-test-6.0
+    - name: aws-auth-test-7.0
+    - name: aws-auth-test-8.0
+    - name: aws-auth-test-rapid
+    - name: aws-auth-test-latest
+  display_name: AWS Auth Ubuntu-20 py3.9
+  run_on:
+    - ubuntu2004-small
+  expansions:
+    PYTHON_BINARY: /opt/python/3.9/bin/python3
+- name: aws-auth-ubuntu-20-py3.13
+  tasks:
+    - name: aws-auth-test-4.4
+    - name: aws-auth-test-5.0
+    - name: aws-auth-test-6.0
+    - name: aws-auth-test-7.0
+    - name: aws-auth-test-8.0
+    - name: aws-auth-test-rapid
+    - name: aws-auth-test-latest
+  display_name: AWS Auth Ubuntu-20 py3.13
+  run_on:
+    - ubuntu2004-small
+  expansions:
+    PYTHON_BINARY: /opt/python/3.13/bin/python3
+- name: aws-auth-win64-py3.9
+  tasks:
+    - name: aws-auth-test-4.4
+    - name: aws-auth-test-5.0
+    - name: aws-auth-test-6.0
+    - name: aws-auth-test-7.0
+    - name: aws-auth-test-8.0
+    - name: aws-auth-test-rapid
+    - name: aws-auth-test-latest
+  display_name: AWS Auth Win64 py3.9
+  run_on:
+    - windows-64-vsMulti-small
+  expansions:
+    skip_ECS_auth_test: "true"
+    PYTHON_BINARY: C:/python/Python39/python.exe
+- name: aws-auth-win64-py3.13
+  tasks:
+    - name: aws-auth-test-4.4
+    - name: aws-auth-test-5.0
+    - name: aws-auth-test-6.0
+    - name: aws-auth-test-7.0
+    - name: aws-auth-test-8.0
+    - name: aws-auth-test-rapid
+    - name: aws-auth-test-latest
+  display_name: AWS Auth Win64 py3.13
+  run_on:
+    - windows-64-vsMulti-small
+  expansions:
+    skip_ECS_auth_test: "true"
+    PYTHON_BINARY: C:/python/Python313/python.exe
+- name: aws-auth-macos-py3.9
+  tasks:
+    - name: aws-auth-test-4.4
+    - name: aws-auth-test-5.0
+    - name: aws-auth-test-6.0
+    - name: aws-auth-test-7.0
+    - name: aws-auth-test-8.0
+    - name: aws-auth-test-rapid
+    - name: aws-auth-test-latest
+  display_name: AWS Auth macOS py3.9
+  run_on:
+    - macos-14
+  expansions:
+    skip_ECS_auth_test: "true"
+    skip_EC2_auth_test: "true"
+    skip_web_identity_auth_test: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.9/bin/python3
+- name: aws-auth-macos-py3.13
+  tasks:
+    - name: aws-auth-test-4.4
+    - name: aws-auth-test-5.0
+    - name: aws-auth-test-6.0
+    - name: aws-auth-test-7.0
+    - name: aws-auth-test-8.0
+    - name: aws-auth-test-rapid
+    - name: aws-auth-test-latest
+  display_name: AWS Auth macOS py3.13
+  run_on:
+    - macos-14
+  expansions:
+    skip_ECS_auth_test: "true"
+    skip_EC2_auth_test: "true"
+    skip_web_identity_auth_test: "true"
+    PYTHON_BINARY: /Library/Frameworks/Python.Framework/Versions/3.13/bin/python3
+
 - matrix_name: "tests-fips"
   matrix_spec:
     platform:
@@ -3933,47 +4331,6 @@ buildvariants:
     - name: testgcpoidc_task_group
       batchtime: 20160 # Use a batchtime of 14 days as suggested by the CSFLE test README
 
-- matrix_name: "aws-auth-test"
-  matrix_spec:
-    platform: [ubuntu-20.04]
-    python-version: ["3.9"]
-  display_name: "MONGODB-AWS Auth ${platform} ${python-version}"
-  tasks:
-    - name: "aws-auth-test-4.4"
-    - name: "aws-auth-test-5.0"
-    - name: "aws-auth-test-6.0"
-    - name: "aws-auth-test-7.0"
-    - name: "aws-auth-test-8.0"
-    - name: "aws-auth-test-rapid"
-    - name: "aws-auth-test-latest"
-
-- matrix_name: "aws-auth-test-mac"
-  matrix_spec:
-    platform: [macos]
-  display_name: "MONGODB-AWS Auth ${platform} ${python-version-mac}"
-  tasks:
-    - name: "aws-auth-test-4.4"
-    - name: "aws-auth-test-5.0"
-    - name: "aws-auth-test-6.0"
-    - name: "aws-auth-test-7.0"
-    - name: "aws-auth-test-8.0"
-    - name: "aws-auth-test-rapid"
-    - name: "aws-auth-test-latest"
-
-- matrix_name: "aws-auth-test-windows"
-  matrix_spec:
-    platform: [windows]
-    python-version-windows: "*"
-  display_name: "MONGODB-AWS Auth ${platform} ${python-version-windows}"
-  tasks:
-    - name: "aws-auth-test-4.4"
-    - name: "aws-auth-test-5.0"
-    - name: "aws-auth-test-6.0"
-    - name: "aws-auth-test-7.0"
-    - name: "aws-auth-test-8.0"
-    - name: "aws-auth-test-rapid"
-    - name: "aws-auth-test-latest"
-
 - name: testgcpkms-variant
   display_name: "GCP KMS"
   run_on:
diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py
index d94c6c02f..3f1ea724e 100644
--- a/.evergreen/scripts/generate_config.py
+++ b/.evergreen/scripts/generate_config.py
@@ -54,6 +54,7 @@ HOSTS["win64"] = Host("win64", "windows-64-vsMulti-small", "Win64")
 HOSTS["win32"] = Host("win32", "windows-64-vsMulti-small", "Win32")
 HOSTS["macos"] = Host("macos", "macos-14", "macOS")
 HOSTS["macos-arm64"] = Host("macos-arm64", "macos-14-arm64", "macOS Arm64")
+HOSTS["ubuntu20"] = Host("ubuntu20", "ubuntu2004-small", "Ubuntu-20")
 HOSTS["ubuntu22"] = Host("ubuntu22", "ubuntu2204-small", "Ubuntu-22")
 
 
@@ -103,7 +104,7 @@ def get_python_binary(python: str, host: str) -> str:
         python = python.replace(".", "")
         return f"{base}/Python{python}/python.exe"
 
-    if host in ["rhel8", "ubuntu22"]:
+    if host in ["rhel8", "ubuntu22", "ubuntu20"]:
         return f"/opt/python/{python}/bin/python3"
 
     if host in ["macos", "macos-arm64"]:
@@ -254,10 +255,13 @@ def create_server_variants() -> list[BuildVariant]:
 
     # Test a subset on each of the other platforms.
     for host in ("macos", "macos-arm64", "win64", "win32"):
-        for (python, (auth, ssl), topology), sync in product(
-            zip_cycle(MIN_MAX_PYTHON, AUTH_SSLS, TOPOLOGIES), SYNCS
-        ):
+        for (
+            python,
+            sync,
+            (auth, ssl),
+        ) in product(MIN_MAX_PYTHON, SYNCS, AUTH_SSLS):
             test_suite = "default" if sync == "sync" else "default_async"
+            topology = TOPOLOGIES[0] if python == CPYTHONS[0] else TOPOLOGIES[-1]
             tasks = [f".{topology}"]
             # MacOS arm64 only works on server versions 6.0+
             if host == "macos-arm64":
@@ -606,10 +610,40 @@ def generate_serverless_variants():
     ]
 
 
+def generate_aws_auth_variants():
+    variants = []
+    tasks = [
+        "aws-auth-test-4.4",
+        "aws-auth-test-5.0",
+        "aws-auth-test-6.0",
+        "aws-auth-test-7.0",
+        "aws-auth-test-8.0",
+        "aws-auth-test-rapid",
+        "aws-auth-test-latest",
+    ]
+
+    for host, python in product(["ubuntu20", "win64", "macos"], MIN_MAX_PYTHON):
+        expansions = dict()
+        if host != "ubuntu20":
+            expansions["skip_ECS_auth_test"] = "true"
+        if host == "macos":
+            expansions["skip_EC2_auth_test"] = "true"
+            expansions["skip_web_identity_auth_test"] = "true"
+        variant = create_variant(
+            tasks,
+            get_display_name("AWS Auth", host, python=python),
+            host=host,
+            python=python,
+            expansions=expansions,
+        )
+        variants.append(variant)
+    return variants
+
+
 ##################
 # Generate Config
 ##################
 
-variants = generate_serverless_variants()
+variants = create_server_variants()
 # print(len(variants))
 generate_yaml(variants=variants)