diff --git a/.azure/pipelines/fast-pr-validation.yml b/.azure/pipelines/fast-pr-validation.yml
index b634a55889..5449521778 100644
--- a/.azure/pipelines/fast-pr-validation.yml
+++ b/.azure/pipelines/fast-pr-validation.yml
@@ -8,12 +8,15 @@ jobs:
     jobName: PR_FastCheck
     jobDisplayName: Fast Check
     agentOs: Windows
-    buildArgs: "/p:FastCheck"
+    buildArgs: "/t:FastCheck"
 - template: jobs/default-build.yml
   parameters:
     jobName: Windows_Build
     jobDisplayName: "Build: Windows"
     agentOs: Windows
+    beforeBuild:
+    - powershell: "& ./src/IISIntegration/tools/UpdateIISExpressCertificate.ps1"
+      displayName: Setup IISExpress test certificates"
 - template: jobs/iisintegration-job.yml
   parameters:
     variables:
diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
index d39a7e1e22..065e4d1770 100644
--- a/.azure/pipelines/jobs/default-build.yml
+++ b/.azure/pipelines/jobs/default-build.yml
@@ -63,6 +63,7 @@ jobs:
 - job: ${{ coalesce(parameters.jobName, parameters.agentOs) }}
   displayName: ${{ coalesce(parameters.jobDisplayName, parameters.agentOs) }}
   dependsOn: ${{ parameters.dependsOn }}
+  timeoutInMinutes: 90
   workspace:
     clean: all
   strategy: