diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index cbce3b6d5..30786b489 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -94,11 +94,10 @@ jobs:
       conda config --add channels conda-forge --force
       conda config --set auto_update_conda false
       conda install --yes ninja
-      dir C:\Miniconda\Library\bin
   - task: CMake@1
     inputs:
       workingDirectory: 'build' # Optional
-      cmakeArgs: '-G "Ninja" ..'
+      cmakeArgs: '-G "Ninja" -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DMSVC_STATIC_CRT=ON ..'
   - task: CMake@1
     inputs:
       cmakeArgs: '--build . --config Release'
@@ -108,21 +107,21 @@ jobs:
   pool:
      vmImage: 'windows-latest'
   steps:  
-  - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
-    displayName: Add conda to PATH
-
-  - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Library\bin"
-    displayName: Add ninja and flang to PATH
-
-  - script: |
+  - powershell: |
+      Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
+      Write-Host "##vso[task.prependpath]$env:CONDA\Library\bin"
+  - powershell: |
       conda config --add channels conda-forge --force
       conda config --set auto_update_conda false
-      conda install --yes --quiet ninja flang
-      mkdir build
-      cd build
-      cmake -G Ninja -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_Fortran_COMPILER=flang -DMSVC_STATIC_CRT=ON ..
-      cmake --build .
-
+      conda install --yes ninja flang
+  - task: CMake@1
+    inputs:
+      workingDirectory: 'build' # Optional
+      cmakeArgs: '-G Ninja -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_Fortran_COMPILER=flang -DMSVC_STATIC_CRT=ON ..'
+  - task: CMake@1
+    inputs:
+      cmakeArgs: '--build . --config Release'
+      workingDirectory: 'build'
 
 - job: OSX_OpenMP
   pool: