diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 43558e37..8755c5dd 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -8,7 +8,7 @@ trigger:
 - dev
 - dev-slice
 
-jobs:
+jobs:  
 - job:
   displayName: Windows
   pool:
@@ -50,7 +50,7 @@ jobs:
   displayName: Linux
   pool:
     vmImage:
-     ubuntu-16.04
+     ubuntu-18.04
   strategy:
     matrix:
       Debug:
@@ -138,3 +138,36 @@ jobs:
     displayName: TestStress    
 #  - upload: $(Build.SourcesDirectory)/$(BuildType)
 #    artifact: mimalloc-macos-$(BuildType)
+
+# - job:
+#   displayName: Windows-2017
+#   pool:
+#     vmImage:
+#       vs2017-win2016
+#   strategy:
+#     matrix:
+#       Debug:
+#         BuildType: debug
+#         cmakeExtraArgs: -A x64 -DCMAKE_BUILD_TYPE=Debug -DMI_DEBUG_FULL=ON
+#         MSBuildConfiguration: Debug
+#       Release:
+#         BuildType: release
+#         cmakeExtraArgs: -A x64 -DCMAKE_BUILD_TYPE=Release
+#         MSBuildConfiguration: Release
+#       Secure:
+#         BuildType: secure
+#         cmakeExtraArgs: -A x64 -DCMAKE_BUILD_TYPE=Release -DMI_SECURE=ON
+#         MSBuildConfiguration: Release
+#   steps:
+#   - task: CMake@1
+#     inputs:
+#       workingDirectory: $(BuildType)
+#       cmakeArgs: .. $(cmakeExtraArgs)
+#   - task: MSBuild@1
+#     inputs:
+#       solution: $(BuildType)/libmimalloc.sln
+#       configuration: '$(MSBuildConfiguration)'
+#   - script: |
+#       cd $(BuildType)
+#       ctest --verbose --timeout 120
+#     displayName: CTest