diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c9cad337..5d8a35fc 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -5,15 +5,23 @@ trigger:
 jobs:
 - job: Linux
   pool:
-    vmImage: 'Ubuntu-16.04'
+    vmImage: 'ubuntu-18.04'
   steps:
   - script: |
       sudo apt-get -qq update;
       sudo pip install --upgrade pip
       sudo apt-get install python-setuptools;
       sudo apt-get install libglew-dev libxrandr-dev libxcursor-dev libxinerama-dev libxi-dev;
-      sudo python build_scripts/build_osd.py --tbb --omp --build $HOME/OSDgen/build --src $HOME/OSDgen/src $HOME/OSDinst
+      sudo python build_scripts/build_osd.py --tests --tbb --omp --build $HOME/OSDgen/build --src $HOME/OSDgen/src $HOME/OSDinst
     displayName: 'Building OpenSubdiv'
+  - script: |
+      cd $HOME/OSDgen/build/s
+      sudo ctest -T test -R far
+    displayName: 'Testing OpenSubdiv'
+  - task: PublishTestResults@2
+    inputs:
+      testResultsFormat: cTest
+      testResultsFiles: /home/vsts/OSDgen/build/s/Testing/*/Test.xml
   - task: PublishPipelineArtifact@0
     inputs:
       artifactName: 'osd-linux'
@@ -22,28 +30,42 @@ jobs:
 
 - job: macOS
   pool:
-    vmImage: 'macOS-10.13'
+    vmImage: 'macOS-10.14'
   steps:
   - script: |
-      # The SYSTEM env var is used by the Makefile of glew and having it set trips it up
-      unset SYSTEM
       /bin/bash -c "sudo xcode-select -s /Applications/Xcode_10.1.app/Contents/Developer"
-      python build_scripts/build_osd.py --tbb --generator Xcode --build $HOME/OSDgen/build --src $HOME/OSDgen/src $HOME/OSDinst
+      python build_scripts/build_osd.py --tests --tbb --generator Xcode --build $HOME/OSDgen/build --src $HOME/OSDgen/src $HOME/OSDinst
     displayName: 'Building OpenSubdiv'
+  - script: |
+      cd $HOME/OSDgen/build/s
+      ctest -T test -R far
+    displayName: 'Testing OpenSubdiv'
+  - task: PublishTestResults@2
+    inputs:
+      testResultsFormat: cTest
+      testResultsFiles: /Users/runner/OSDgen/build/s/Testing/*/Test.xml
   - task: PublishPipelineArtifact@0
     inputs:
       artifactName: 'osd-macOS'
-      targetPath: "  /Users/runner/OSDinst"
+      targetPath: "/Users/runner/OSDinst"
 
 - job: Windows
   pool:
-    vmImage: 'VS2017-Win2016'
+    vmImage: 'windows-2019'
   steps:
   - script: |
-      call C:\"Program Files (x86)"\"Microsoft Visual Studio"\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat
+      call C:\"Program Files (x86)"\"Microsoft Visual Studio"\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat
       call set PATH=C:/Python27amd64;C:/Python27amd64/Scripts;%PATH%
-      call python build_scripts/build_osd.py --tbb --omp --build %HOME%/OSDgen/build --src %HOME%/OSDgen/src %HOME%/OSDinst
+      call python build_scripts/build_osd.py --tests --tbb --omp --build %HOME%/OSDgen/build --src %HOME%/OSDgen/src %HOME%/OSDinst
     displayName: 'Building OpenSubdiv'
+  - script: |
+      cd %HOME%/OSDgen/build/s
+      ctest -T test -R far
+    displayName: 'Testing OpenSubdiv'
+  - task: PublishTestResults@2
+    inputs:
+      testResultsFormat: cTest
+      testResultsFiles: D:/OSDgen/build/s/Testing/*/Test.xml
   - task: PublishPipelineArtifact@0
     inputs:
       artifactName: 'osd-win64'