diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 9a6d798f5..3cbb2ccc0 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -129,10 +129,12 @@ jobs:
 #          command: 'custom'
 #          custom: 'nuget'
 #          arguments: 'push --source https://nuget.pkg.github.com/xamarin/index.json --api-key $(GitHub.NuGet.Token) "$(Build.ArtifactStagingDirectory)\nuget\*.nupkg"'
-      - task: CmdLine@2
-        displayName: 'Run Unit Tests'
+      - task: DotNetCoreCLI@2
+        displayName: Run Tests
         inputs:
-          script: dotnet test $(PathToUnitTestCsproj) -c 'Release' --collect "Code coverage"
+          command: test
+          projects: '**/*.UnitTests.csproj'
+          arguments: '--configuration Release --collect "Code coverage'
       # publish the packages
       - task: PublishBuildArtifacts@1
         displayName: 'Publish Unsigned NuGets'