diff --git a/Versions.props b/Versions.props
index 7cb6acc..7ae8dc5 100644
--- a/Versions.props
+++ b/Versions.props
@@ -9,8 +9,8 @@
     <NerdbankGitVersioningVersion>3.6.133</NerdbankGitVersioningVersion>
     <NSubstituteVersion>5.1.0</NSubstituteVersion>
     <TunnelVisionLabsReferenceAssemblyAnnotatorVersion>1.0.0-alpha.160</TunnelVisionLabsReferenceAssemblyAnnotatorVersion>
-    <XunitAnalyzersVersion>1.6.0</XunitAnalyzersVersion>
-    <XunitVersion>2.6.2</XunitVersion>
+    <XunitAnalyzersVersion>1.7.0-pre.10</XunitAnalyzersVersion>
+    <XunitVersion>2.6.3-pre.3</XunitVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/src/xunit.runner.visualstudio/VsTestRunner.cs b/src/xunit.runner.visualstudio/VsTestRunner.cs
index 8f80168..b0fafa5 100644
--- a/src/xunit.runner.visualstudio/VsTestRunner.cs
+++ b/src/xunit.runner.visualstudio/VsTestRunner.cs
@@ -541,11 +541,13 @@ void RunTestsInAssembly(
 				reporterMessageHandler.OnMessage(new TestAssemblyExecutionStarting(runInfo.Assembly, executionOptions));
 
 				using var vsExecutionSink = new VsExecutionSink(reporterMessageHandler, frameworkHandle, logger, testCasesMap, () => cancelled);
-				IExecutionSink resultsSink = vsExecutionSink;
-				if (longRunningSeconds > 0)
-					resultsSink = new DelegatingLongRunningTestDetectionSink(resultsSink, TimeSpan.FromSeconds(longRunningSeconds), diagnosticsSinkLocal);
-				if (configuration.FailSkipsOrDefault)
-					resultsSink = new DelegatingFailSkipSink(resultsSink);
+				var executionSinkOptions = new ExecutionSinkOptions
+				{
+					DiagnosticMessageSink = diagnosticsSinkRemote,
+					FailSkips = configuration.FailSkipsOrDefault,
+					LongRunningTestTime = TimeSpan.FromSeconds(longRunningSeconds),
+				};
+				var resultsSink = new ExecutionSink(vsExecutionSink, executionSinkOptions);
 
 				controller.RunTests(testCases, resultsSink, executionOptions);
 				resultsSink.Finished.WaitOne();