diff --git a/.azure-pipelines/client.test.yml b/.azure-pipelines/client.test.yml
index 1c1fd14118..8b73878283 100644
--- a/.azure-pipelines/client.test.yml
+++ b/.azure-pipelines/client.test.yml
@@ -10,9 +10,6 @@ jobs:
     pool:
       vmImage: ${{ parameters.vmImage }}
 
-    variables:
-      build.path: 'test/services/keyVault'
-
     strategy:
       matrix:
         Node6:
@@ -38,7 +35,7 @@ jobs:
       - task: Npm@1
         inputs:
           command: 'custom'
-          customCommand: 'run mocha -- $(build.path) --reporter mocha-junit-reporter'
+          customCommand: 'run mocha -- $(test.path) --reporter mocha-junit-reporter'
         displayName: 'npm run mocha'
 
       - task: PublishTestResults@2
diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml
index 9f2216f23b..32ef5f7584 100644
--- a/.azure-pipelines/client.yml
+++ b/.azure-pipelines/client.yml
@@ -3,7 +3,6 @@ trigger:
 
 variables:
   node.version: '10.x'
-  build.path: 'lib/services/keyVault'
 
 jobs:
   - job: 'Publish'
@@ -20,19 +19,19 @@ jobs:
       - task: Npm@1
         inputs:
           command: 'install'
-          workingDir: '$(build.path)'
+          workingDir: '$(source.path)'
         displayName: 'npm install'
 
       - task: Npm@1
         inputs:
           command: 'custom'
           customCommand: 'pack'
-          workingDir: '$(build.path)'
+          workingDir: '$(source.path)'
         displayName: 'npm pack'
 
       - task: CopyFiles@2
         inputs:
-          sourceFolder: '$(build.path)'
+          sourceFolder: '$(source.path)'
           contents: '*.tgz'
           targetFolder: $(Build.ArtifactStagingDirectory)
         displayName: 'Copy Package'
@@ -55,11 +54,11 @@ jobs:
         inputs:
           command: 'custom'
           customCommand: 'i --package-lock-only'
-          workingDir: '$(build.path)'
+          workingDir: '$(source.path)'
         displayName: 'npm i --package-lock-only'
 
       - powershell: "npm audit --json | ConvertFrom-Json | Select-Object  -expandProperty 'metadata' | select-object -expandproperty 'vulnerabilities' | %{ if ($_.low + $_.moderate + $_.high + $_.critical -ne 0) { write-error 'FAILED! Your package has vulnerabilities. Check npm audit' }}"
-        workingDirectory: '$(build.path)'
+        workingDirectory: '$(source.path)'
         displayName: 'npm audit'
 
   - template: client.test.yml