diff --git a/eng/pipelines/templates/stages/cosmos-sdk-client.yml b/eng/pipelines/templates/stages/cosmos-sdk-client.yml
index 7e284438a3a4..ed8f617540b6 100644
--- a/eng/pipelines/templates/stages/cosmos-sdk-client.yml
+++ b/eng/pipelines/templates/stages/cosmos-sdk-client.yml
@@ -5,15 +5,9 @@ parameters:
 - name: ServiceDirectory
   type: string
   default: not-specified
-- name: EmulatorMsiUrl
-  type: string
-  default: https://aka.ms/cosmosdb-emulator
 - name: InjectedPackages
   type: string
   default: ''
-- name: EmulatorStartParameters
-  type: string
-  default: ''
 - name: TestProxy
   type: boolean
   default: false
@@ -21,37 +15,17 @@ parameters:
 extends:
   template: /eng/pipelines/templates/stages/archetype-sdk-client.yml
   parameters:
-    ServiceDirectory: ${{ parameters.ServiceDirectory }}
-    # Skip emulator tests in the CI run
-    TestMarkArgument: not cosmosEmulator
-    InjectedPackages: ${{parameters.InjectedPackages}}
-    Artifacts: ${{parameters.Artifacts}}
-
-#  - stage: Test_Emulator
-#    dependsOn: []
-#    jobs:
-#    - job: Emulator
-#      strategy:
-#        matrix:
-#          Windows_Python36:
-#            OSVmImage: 'windows-2022'
-#            PythonVersion: '3.6'
-#      pool:
-#        vmImage: $(OSVmImage)
-#
-#      steps:
-#        - template: /eng/common/pipelines/templates/steps/cosmos-emulator.yml
-#          parameters:
-#            EmulatorMsiUrl: ${{ parameters.EmulatorMsiUrl }}
-#            StartParameters: ${{ parameters.EmulatorStartParameters }}
-#
-#        - template: /eng/pipelines/templates/steps/build-test.yml
-#          parameters:
-#            TestMarkArgument: not globaldb
-#            EnvVars:
-#              ACCOUNT_HOST: https://localhost:8081/
-#            ServiceDirectory: ${{ parameters.ServiceDirectory }}
-#            PythonVersion: $(PythonVersion)
-#            OSVmImage: $(OSVmImage)
-#            ToxTestEnv: 'whl,sdist'
-#            InjectedPackages: ${{parameters.InjectedPackages}}
+    ServiceDirectory: cosmos
+    BeforeTestSteps:
+      - template: /eng/common/pipelines/templates/steps/cosmos-emulator.yml
+        parameters:
+          StartParameters: '/noexplorer /noui /enablepreview /EnableSqlComputeEndpoint /SqlComputePort=9999 /disableratelimiting /partitioncount=50 /consistency=Session'
+    # TestMarkArgument: not cosmosEmulator
+    MatrixConfigs:
+      - Name: Python_cosmos_emulator
+        Path: sdk/cosmos/cosmos-emulator-matrix.json
+        Selection: all
+        GenerateVMJobs: true
+    Artifacts:
+    - name: azure-cosmos
+      safeName: azurecosmos
diff --git a/sdk/cosmos/azure-cosmos/test/test_crud_async.py b/sdk/cosmos/azure-cosmos/test/test_crud_async.py
index 764c4a430656..58fb41ffc102 100644
--- a/sdk/cosmos/azure-cosmos/test/test_crud_async.py
+++ b/sdk/cosmos/azure-cosmos/test/test_crud_async.py
@@ -111,6 +111,7 @@ async def _set_up(cls):
             test_config._test_config.TEST_DATABASE_ID)
 
     async def _clear(self):
+        print("Clearing databases")
         async for db in self.client.list_databases():
             self.client.delete_database(db["id"])
 
diff --git a/sdk/cosmos/cosmos-emulator-matrix.json b/sdk/cosmos/cosmos-emulator-matrix.json
new file mode 100644
index 000000000000..f8dd3e837eba
--- /dev/null
+++ b/sdk/cosmos/cosmos-emulator-matrix.json
@@ -0,0 +1,68 @@
+{
+    "displayNames": {
+      "--disablecov": "",
+      "false": "",
+      "true": ""
+    },
+    "matrix": {
+      "Agent": {
+        "windows-2022": { "OSVmImage": "MMS2022", "Pool": "azsdk-pool-mms-win-2022-general" }
+      },
+      "EmulatorConfig": {
+        "Emulator Tests Python 3.7": {
+            "PythonVersion": 3.7,
+            "CoverageArg": "--disablecov",
+            "TestSamples": "false",
+            "ToxTestEnv": "'whl,sdist'",
+            "ACCOUNT_HOST": "https://localhost:8081/",
+            "ACCOUNT_KEY": "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==",
+            "Skip.Analyze": "true"
+        },
+        "Emulator Tests Python 3.8": {
+            "PythonVersion": 3.8,
+            "CoverageArg": "--disablecov",
+            "TestSamples": "false",
+            "ToxTestEnv": "'whl,sdist'",
+            "ACCOUNT_HOST": "https://localhost:8081/",
+            "ACCOUNT_KEY": "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==",
+            "Skip.Analyze": "true"
+        },
+        "Emulator Tests Python 3.9": {
+            "PythonVersion": 3.9,
+            "CoverageArg": "--disablecov",
+            "TestSamples": "false",
+            "ToxTestEnv": "'whl,sdist'",
+            "ACCOUNT_HOST": "https://localhost:8081/",
+            "ACCOUNT_KEY": "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==",
+            "Skip.Analyze": "true"
+        },
+        "Emulator Tests Python 3.10": {
+            "PythonVersion": 3.10,
+            "CoverageArg": "--disablecov",
+            "TestSamples": "false",
+            "ToxTestEnv": "'whl,sdist'",
+            "ACCOUNT_HOST": "https://localhost:8081/",
+            "ACCOUNT_KEY": "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==",
+            "Skip.Analyze": "true"
+        },
+        "Emulator Tests Python 3.11": {
+            "PythonVersion": 3.11,
+            "CoverageArg": "--disablecov",
+            "TestSamples": "false",
+            "ToxTestEnv": "'whl,sdist'",
+            "ACCOUNT_HOST": "https://localhost:8081/",
+            "ACCOUNT_KEY": "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==",
+            "Skip.Analyze": "true"
+        },
+        "Emulator Tests Python 3.12": {
+            "PythonVersion": 3.12,
+            "CoverageArg": "--disablecov",
+            "TestSamples": "false",
+            "ToxTestEnv": "'whl,sdist'",
+            "ACCOUNT_HOST": "https://localhost:8081/",
+            "ACCOUNT_KEY": "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==",
+            "Skip.Analyze": "true"
+        }
+      }
+    }
+  }