diff --git a/.azure-pipelines/jobs/test-windows.yml b/.azure-pipelines/jobs/test-windows.yml
index 728a4ea69e2..2d1166f4e37 100644
--- a/.azure-pipelines/jobs/test-windows.yml
+++ b/.azure-pipelines/jobs/test-windows.yml
@@ -3,28 +3,28 @@ parameters:
 
 jobs:
 - job: Test_Primary
-  displayName: Test Primary
+  displayName: Tests /
 
   pool:
     vmImage: ${{ parameters.vmImage }}
   strategy:
     matrix:
-      Python27-x86:
+      "2.7-x86":
         python.version: '2.7'
         python.architecture: x86
-      Python27-x64:
+      "2.7":
         python.version: '2.7'
         python.architecture: x64
-      Python35-x64:
+      "3.5":
         python.version: '3.5'
         python.architecture: x64
-      Python36-x64:
+      "3.6":
         python.version: '3.6'
         python.architecture: x64
-      Python37-x64:
+      "3.7":
         python.version: '3.7'
         python.architecture: x64
-      Python38-x64:
+      "3.8":
         python.version: '3.8'
         python.architecture: x64
     maxParallel: 6
@@ -35,7 +35,7 @@ jobs:
       runIntegrationTests: true
 
 - job: Test_Secondary
-  displayName: Test Secondary
+  displayName: Tests /
   # Don't run integration tests for these runs
   # Run after Test_Primary so we don't devour time and jobs if tests are going to fail
   dependsOn: Test_Primary
@@ -45,16 +45,16 @@ jobs:
   strategy:
     matrix:
       # This is for Windows, so test x86 builds
-      Python35-x86:
+      "3.5-x86":
         python.version: '3.5'
         python.architecture: x86
-      Python36-x86:
+      "3.6-x86":
         python.version: '3.6'
         python.architecture: x86
-      Python37-x86:
+      "3.7-x86":
         python.version: '3.7'
         python.architecture: x86
-      Python38-x86:
+      "3.8-x86":
         python.version: '3.8'
         python.architecture: x86
     maxParallel: 6
diff --git a/.azure-pipelines/jobs/test.yml b/.azure-pipelines/jobs/test.yml
index 68b6e5268e1..f7dac5143f7 100644
--- a/.azure-pipelines/jobs/test.yml
+++ b/.azure-pipelines/jobs/test.yml
@@ -3,16 +3,16 @@ parameters:
 
 jobs:
 - job: Test_Primary
-  displayName: Test Primary
+  displayName: Tests /
 
   pool:
     vmImage: ${{ parameters.vmImage }}
   strategy:
     matrix:
-      Python27:
+      "2.7":
         python.version: '2.7'
         python.architecture: x64
-      Python36:
+      "3.6":
         python.version: '3.6'
         python.architecture: x64
     maxParallel: 2
@@ -21,7 +21,7 @@ jobs:
   - template: ../steps/run-tests.yml
 
 - job: Test_Secondary
-  displayName: Test Secondary
+  displayName: Tests /
   # Run after Test_Primary so we don't devour time and jobs if tests are going to fail
   dependsOn: Test_Primary
 
@@ -29,13 +29,13 @@ jobs:
     vmImage: ${{ parameters.vmImage }}
   strategy:
     matrix:
-      Python35:
+      "3.5":
         python.version: '3.5'
         python.architecture: x64
-      Python37:
+      "3.7":
         python.version: '3.7'
         python.architecture: x64
-      Python38:
+      "3.8":
         python.version: '3.8'
         python.architecture: x64
     maxParallel: 4