diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0b5b277b2b5..a7fcd391210 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,10 +7,6 @@ on:
       - release/*
     tags: [ '*' ]
   pull_request:
-    branches:
-      - main
-      - release/*
-      - dotnet-vnext
   workflow_dispatch:
 
 env:
diff --git a/.github/workflows/code-ql.yml b/.github/workflows/code-ql.yml
index 5846078d234..c7ac4f0e22e 100644
--- a/.github/workflows/code-ql.yml
+++ b/.github/workflows/code-ql.yml
@@ -6,10 +6,6 @@ on:
       - main
       - release/*
   pull_request:
-    branches:
-      - main
-      - release/*
-      - dotnet-vnext
   schedule:
     - cron: '0 8 * * MON'
   workflow_dispatch:
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
index 23ccb78883d..55a79810898 100644
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -2,10 +2,6 @@ name: dependency-review
 
 on:
   pull_request:
-    branches:
-      - main
-      - release/*
-      - dotnet-vnext
 
 permissions: {}
 
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index a99d9ae7cc9..c8e7084da03 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -6,10 +6,6 @@ on:
       - main
       - release/*
   pull_request:
-    branches:
-      - main
-      - release/*
-      - dotnet-vnext
   workflow_dispatch:
 
 permissions: {}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 819694eb97d..40c922431d6 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -10,10 +10,6 @@ on:
       - '**/*.gitignore'
       - '**/*.md'
   pull_request:
-    branches:
-      - main
-      - release/*
-      - dotnet-vnext
   workflow_dispatch:
 
 permissions: {}
diff --git a/.github/workflows/mutation-tests.yml b/.github/workflows/mutation-tests.yml
index 949d9c48ee1..c4db8439227 100644
--- a/.github/workflows/mutation-tests.yml
+++ b/.github/workflows/mutation-tests.yml
@@ -6,10 +6,6 @@ on:
       - main
       - release/*
   pull_request:
-    branches:
-      - main
-      - release/*
-      - dotnet-vnext
   workflow_dispatch:
 
 env:
diff --git a/.github/workflows/updater-approve.yml b/.github/workflows/updater-approve.yml
index a3ec47edb95..648338ecb89 100644
--- a/.github/workflows/updater-approve.yml
+++ b/.github/workflows/updater-approve.yml
@@ -2,10 +2,6 @@ name: updater-approve
 
 on:
   pull_request:
-    branches:
-      - main
-      - release/*
-      - dotnet-vnext
 
 permissions: {}
 
diff --git a/test/Polly.Core.Tests/CircuitBreaker/Controller/ScheduledTaskExecutorTests.cs b/test/Polly.Core.Tests/CircuitBreaker/Controller/ScheduledTaskExecutorTests.cs
index eb096574ebd..640715479ce 100644
--- a/test/Polly.Core.Tests/CircuitBreaker/Controller/ScheduledTaskExecutorTests.cs
+++ b/test/Polly.Core.Tests/CircuitBreaker/Controller/ScheduledTaskExecutorTests.cs
@@ -132,7 +132,7 @@ public void Dispose_WhenScheduledTaskExecuting()
     [Fact]
     public void ScheduleTask_InlineContinuationDoesNotDeadlock()
     {
-        var timeout = TimeSpan.FromSeconds(1);
+        var timeout = TimeSpan.FromSeconds(10);
         using var scheduler = new ScheduledTaskExecutor();
 
         var firstTask = scheduler.ScheduleTask(() => Task.CompletedTask);
@@ -147,7 +147,9 @@ public void ScheduleTask_InlineContinuationDoesNotDeadlock()
             TaskContinuationOptions.ExecuteSynchronously,
             TaskScheduler.Default);
 
-        continuationTask.Wait(timeout).ShouldBeTrue();
+#pragma warning disable xUnit1031
+        Task.WaitAll([firstTask, continuationTask], timeout).ShouldBeTrue();
+#pragma warning restore xUnit1031
     }
 
     [Fact]