diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index daa686340cd4..406948e29289 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -7,7 +7,7 @@ parameters:
   ToxEnvParallel: '--tenvparallel'
   InjectedPackages: ''
   BuildDocs: true
-  SkipPyPyTest: false
+  SkipPythonVersion: ''
   TestMatrix:
     Linux_Python27:
       OSVmImage: 'ubuntu-18.04'
@@ -93,8 +93,8 @@ jobs:
       matrix:
         ${{ each matrixEntry in parameters.TestMatrix }}:
           ${{ if or(eq(matrixEntry.value.RunForPR, 'true'), ne(variables['Build.Reason'], 'PullRequest')) }}:
-            # Skip pypy3 if any specific service has opted out
-            ${{ if or(ne(matrixEntry.value.PythonVersion, 'pypy3'), ne(parameters.SkipPyPYTest, 'true')) }}:
+            # Skip python version if any specific service has opted out
+            ${{ if not(contains(parameters.SkipPythonVersion, matrixEntry.value.PythonVersion)) }}:
               ${{ matrixEntry.key }}:
                 ${{ insert }}: ${{ matrixEntry.value }}
         
diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml
index e1dbf50f7624..5781942a3cec 100644
--- a/eng/pipelines/templates/stages/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/stages/archetype-sdk-client.yml
@@ -20,9 +20,9 @@ parameters:
 - name: TargetDocRepoName
   type: string
   default: azure-docs-sdk-python
-- name: SkipPyPyTest
-  type: boolean
-  default: false
+- name: SkipPythonVersion
+  type: string
+  default: ''
 
 stages:
   - stage: Build
@@ -33,7 +33,7 @@ stages:
         ToxEnvParallel: ${{parameters.ToxEnvParallel}}
         BuildDocs: ${{parameters.BuildDocs}}
         InjectedPackages: ${{parameters.InjectedPackages}}
-        SkipPyPyTest: ${{parameters.SkipPyPyTest}}
+        SkipPythonVersion: ${{parameters.SkipPythonVersion}}
 
   # The Prerelease and Release stages are conditioned on whether we are building a pull request and the branch.
   - ${{if and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal'))}}:
diff --git a/sdk/servicebus/ci.yml b/sdk/servicebus/ci.yml
index 56294596d3ba..29f5e55ae4ef 100644
--- a/sdk/servicebus/ci.yml
+++ b/sdk/servicebus/ci.yml
@@ -33,5 +33,5 @@ extends:
       safeName: azuremgmtservicebus
     - name: azure_servicebus
       safeName: azureservicebus
-    SkipPyPyTest: true
+    SkipPythonVersion: 'pypy3'