diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7c7695502aa..e2d2f3ac80f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -6,42 +6,43 @@ jobs:
   - job: CMake
     timeoutInMinutes: 120
     strategy:
+      maxParallel: 6
       matrix:
         Linux.Debug:
           image_name: 'ubuntu-latest'
           deps: 'sudo apt-get install -y ninja-build clang libicu-dev'
           build_type: 'Debug'
-          test_target: 'check'
+          do_test: true
           libtype_flag: ''
         Linux.ReleaseWithDebug:
           image_name: 'ubuntu-latest'
           deps: 'sudo apt-get install -y ninja-build clang libicu-dev'
           build_type: 'RelWithDebInfo'
-          test_target: 'check'
+          do_test: true
           libtype_flag: ''
         Linux.Release:
           image_name: 'ubuntu-latest'
           deps: 'sudo apt-get install -y ninja-build clang libicu-dev'
           build_type: 'Release'
-          test_target: 'all'
+          do_test: false
           libtype_flag: ''
         OSX.Debug:
           image_name: 'macOS-latest'
           deps: 'brew install ninja icu4c'
           build_type: 'Debug'
-          test_target: 'check'
+          do_test: true
           libtype_flag: '-DSTATIC_LIBRARY=ON'
         OSX.ReleaseWithDebug:
           image_name: 'macOS-latest'
           deps: 'brew install ninja icu4c'
           build_type: 'RelWithDebInfo'
-          test_target: 'check'
+          do_test: true
           libtype_flag: ''
         OSX.Release:
           image_name: 'macOS-latest'
           deps: 'brew install ninja icu4c'
           build_type: 'Release'
-          test_target: 'all'
+          do_test: false
           libtype_flag: ''
 
     pool:
@@ -65,7 +66,57 @@ jobs:
 
     - script: |
         cd build
-        ninja $TARGET
-      displayName: 'Build and test'
+        ninja
+      displayName: 'Build'
+
+    - script: |
+        cd build
+        ninja check
+      displayName: 'Test'
+      condition: eq(variables['do_test'], true)
+
+  - job: MSVC
+    timeoutInMinutes: 120
+    pool:
+      vmImage: 'windows-latest'
+    strategy:
+      maxParallel: 4
+      matrix:
+        x86.Debug:
+          build_type: 'debug'
+          target: 'x86'
+          do_test: true
+        x86.Test:
+          build_type: 'test'
+          target: 'x86'
+          do_test: true
+        x86.Release:
+          build_type: 'release'
+          target: 'x86'
+          do_test: false
+        x64.Debug:
+          build_type: 'debug'
+          target: 'x64'
+          do_test: true
+        x64.Test:
+          build_type: 'test'
+          target: 'x64'
+          do_test: true
+        x64.Release:
+          build_type: 'release'
+          target: 'x64'
+          do_test: false
+      
+    steps:
+    - script: jenkins\buildone.cmd %TARGET% %BUILD%
+      displayName: 'Build'
+      env:
+        TARGET: $(target)
+        BUILD: $(build_type)
+
+    - script: jenkins\testone.cmd %TARGET% %BUILD%
+      displayName: 'Test'
+      condition: eq(variables['do_test'], true)
       env:
-        TARGET: $(test_target)
+        TARGET: $(target)
+        BUILD: $(build_type)