diff --git a/.azure-pipelines/templates/azdev_setup.yml b/.azure-pipelines/templates/azdev_setup.yml
index 82298f2fe6c..bfbb47df03b 100644
--- a/.azure-pipelines/templates/azdev_setup.yml
+++ b/.azure-pipelines/templates/azdev_setup.yml
@@ -14,7 +14,7 @@ steps:
       chmod +x env/bin/activate
       . env/bin/activate
 
-      pip install -q azdev
+      pip install -q git+https://github.com/Azure/azure-cli-dev-tools.git@master
       azdev --version
 
       if [ -z "$CLI_EXT_REPO_PATH" ]; then
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 3f67f07261a..d23fba0e331 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -854,19 +854,33 @@ jobs:
       azdev verify history
       azdev verify document-map
 
-- job: CheckLoadPerformance
-  displayName: "Check Module Load Performance"
-
+- job: PerformanceCheck
+  displayName: "PerformanceCheck"
+  strategy:
+    matrix:
+      Python36:
+        python.version: '3.6'
+      Python38:
+        python.version: '3.8'
   pool:
     vmImage: 'ubuntu-16.04'
   steps:
   - task: UsePythonVersion@0
-    displayName: 'Use Python 3.6'
+    displayName: 'Use Python $(python.version)'
     inputs:
-      versionSpec: 3.6
+      versionSpec: '$(python.version)'
+  - template: .azure-pipelines/templates/azdev_setup.yml
   - bash: |
-      . scripts/ci/install_azdev.sh
+      set -ev
+      . env/bin/activate
       azdev perf load-times
+    displayName: "Load Performance"
+  - bash: |
+      set -ev
+      . env/bin/activate
+
+      azdev perf benchmark "version" "network vnet -h" "rest -h" "storage account"
+    displayName: "Execution Performance"
 
 - job: CheckLinter
   displayName: "Check CLI Linter"