diff --git a/build/ci/.azure-devops-skia-tests.yml b/build/ci/.azure-devops-skia-tests.yml
index 357524c247d8..8f936b88bd05 100644
--- a/build/ci/.azure-devops-skia-tests.yml
+++ b/build/ci/.azure-devops-skia-tests.yml
@@ -8,7 +8,6 @@ jobs:
   displayName: 'Skia Samples App Build'
   timeoutInMinutes: 60
 
-  #pool: ${{ parameters.poolName }}
   pool:
     vmImage: ${{ parameters.vmImage }}
 
@@ -52,10 +51,9 @@ jobs:
 ##
 
 - job: Skia_Gtk_Screenshot_Tests
-  displayName: 'Skia Samples App Snapshot Tests'
+  displayName: 'Skia GTK Snapshot Tests'
   timeoutInMinutes: 60
 
-  #pool: ${{ parameters.poolName }}
   pool:
     vmImage: ${{ parameters.vmMacImage }}
 
@@ -68,14 +66,13 @@ jobs:
         downloadPath: '$(build.sourcesdirectory)/build'
 
   - template: templates/dotnet-install.yml
-  #- template: templates/gtk-install.yml
   - template: templates/gtk-install-macos.yml
 
   - script: |
         cd $(build.sourcesdirectory)/build/skia-gtk-samples-app
         dotnet SamplesApp.Skia.Gtk.dll --auto-screenshots=$(build.artifactstagingdirectory)/screenshots/skia-gtk-screenshots
 
-    displayName: Run Skia UI Snapshot Tests
+    displayName: Run Skia GTK Snapshot Tests
 
   - task: PublishBuildArtifacts@1
     condition: always()
@@ -85,10 +82,9 @@ jobs:
       ArtifactType: Container
 
 - job: Skia_Gtk_Runtime_Tests_Build
-  displayName: 'Skia Samples App Runtime Tests'
+  displayName: 'Skia GTK Runtime Tests'
   timeoutInMinutes: 30
 
-  #pool: ${{ parameters.poolName }}
   pool:
     vmImage: ${{ parameters.vmMacImage }}
 
@@ -101,7 +97,6 @@ jobs:
         downloadPath: '$(build.sourcesdirectory)/build'
 
   - template: templates/dotnet-install.yml
-  #- template: templates/gtk-install.yml
   - template: templates/gtk-install-macos.yml
 
   - script: |
@@ -118,3 +113,67 @@ jobs:
       testResultsFiles: '$(build.sourcesdirectory)/build/skia-gtk-runtime-tests-results.xml'
       failTaskOnFailedTests: true
 
+##
+## WPF
+##
+
+- job: Skia_Wpf_Screenshot_Tests
+  displayName: 'Skia WPF Snapshot Tests'
+  timeoutInMinutes: 60
+
+  pool:
+    vmImage: ${{ parameters.vmImage }}
+
+  dependsOn: Skia_Tests_Build
+
+  steps:
+  - task: DownloadBuildArtifacts@0
+    inputs:
+        artifactName: skia-wpf-samples-app
+        downloadPath: '$(build.sourcesdirectory)/build'
+
+  - template: templates/dotnet-install.yml
+
+  - script: |
+        cd $(build.sourcesdirectory)/build/skia-wpf-samples-app
+        dotnet SamplesApp.Skia.Wpf.dll --auto-screenshots=$(build.artifactstagingdirectory)/screenshots/skia-wpf-screenshots
+
+    displayName: Run Skia WPF Snapshot Tests
+
+  - task: PublishBuildArtifacts@1
+    condition: always()
+    inputs:
+      PathtoPublish: $(build.artifactstagingdirectory)
+      ArtifactName: uitests-results
+      ArtifactType: Container
+
+- job: Skia_Wpf_Runtime_Tests_Build
+  displayName: 'Skia WPF Runtime Tests'
+  timeoutInMinutes: 30
+
+  pool:
+    vmImage: ${{ parameters.vmImage }}
+
+  dependsOn: Skia_Tests_Build
+
+  steps:
+  - task: DownloadBuildArtifacts@0
+    inputs:
+        artifactName: skia-wpf-samples-app
+        downloadPath: '$(build.sourcesdirectory)/build'
+
+  - template: templates/dotnet-install.yml
+
+  - script: |
+        cd $(build.sourcesdirectory)/build/skia-wpf-samples-app
+        dotnet SamplesApp.Skia.Wpf.dll --runtime-tests=$(build.sourcesdirectory)/build/skia-wpf-runtime-tests-results.xml
+
+    displayName: Run Skia WPF Runtime Tests
+
+  - task: PublishTestResults@2
+    condition: always()
+    inputs:
+      testRunTitle: 'Skia WPF Runtime Tests'
+      testResultsFormat: 'NUnit'
+      testResultsFiles: '$(build.sourcesdirectory)/build/skia-wpf-runtime-tests-results.xml'
+      failTaskOnFailedTests: true
\ No newline at end of file