diff --git a/eng/pipelines/templates/stages/archetype-java-release.yml b/eng/pipelines/templates/stages/archetype-java-release.yml
index 3d7ba06a7b946..aa4cdc22774ed 100644
--- a/eng/pipelines/templates/stages/archetype-java-release.yml
+++ b/eng/pipelines/templates/stages/archetype-java-release.yml
@@ -1,6 +1,6 @@
 parameters:
   - name: DependsOn
-    type: string
+    type: object
   - name: ServiceDirectory
     type: string
   - name: SDKType
diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml
index 5de36bcf99216..c251764b3e1d0 100644
--- a/eng/pipelines/templates/stages/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/stages/archetype-sdk-client.yml
@@ -77,7 +77,8 @@ stages:
   - ${{if and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal'))}}:
     - template: archetype-java-release.yml
       parameters:
-        DependsOn: Build
+        DependsOn:
+          - Build
         ServiceDirectory: ${{ parameters.ServiceDirectory }}
         SDKType: ${{ parameters.SDKType }}
         Artifacts: ${{ parameters.Artifacts }}
diff --git a/eng/pipelines/templates/stages/cosmos-sdk-client.yml b/eng/pipelines/templates/stages/cosmos-sdk-client.yml
index cfcb9f41ad52c..f2763df0b18ea 100644
--- a/eng/pipelines/templates/stages/cosmos-sdk-client.yml
+++ b/eng/pipelines/templates/stages/cosmos-sdk-client.yml
@@ -38,7 +38,7 @@ stages:
           - template: ../steps/install-reporting-tools.yml
         MatrixConfigs:
           - Name: Cosmos_ci_test
-            Path: eng/pipelines/templates/stages/platform-matrix.cosmos.json
+            Path: eng/pipelines/templates/stages/platform-matrix.json
             Selection: sparse
             NonSparseParameters: Agent
             GenerateVMJobs: true
@@ -48,6 +48,10 @@ stages:
           - TestOptions=.*/-Punit
           - AZURE_TEST.*=.*/
 
+  - stage: TestEmulator
+    displayName: Test Emulator
+    dependsOn: []
+    jobs:
     - template: /eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml
       parameters:
         JobTemplatePath: /eng/pipelines/templates/jobs/live.tests.yml
@@ -103,7 +107,9 @@ stages:
   - ${{if and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal'))}}:
     - template: archetype-java-release.yml
       parameters:
-        DependsOn: Build
+        DependsOn:
+          - Build
+          - TestEmulator
         ServiceDirectory: ${{parameters.ServiceDirectory}}
         SDKType: ${{parameters.SDKType}}
         Artifacts: ${{parameters.Artifacts}}