diff --git a/Versions.props b/Versions.props
index 554ebe8c..34f11e80 100644
--- a/Versions.props
+++ b/Versions.props
@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <MicrosoftNetCoreAppRefVersion>6.0.11</MicrosoftNetCoreAppRefVersion>
-    <MicrosoftNetTestSdkVersion>17.6.2</MicrosoftNetTestSdkVersion>
+    <MicrosoftNetTestSdkVersion>17.6.3</MicrosoftNetTestSdkVersion>
     <MicrosoftSourceLinkGitHubVersion>1.1.1</MicrosoftSourceLinkGitHubVersion>
     <MicrosoftTestPlatformObjectModelVersion>17.6.2</MicrosoftTestPlatformObjectModelVersion>
     <NerdbankGitVersioningVersion>3.6.133</NerdbankGitVersioningVersion>
     <NSubstituteVersion>5.0.0</NSubstituteVersion>
     <TunnelVisionLabsReferenceAssemblyAnnotatorVersion>1.0.0-alpha.160</TunnelVisionLabsReferenceAssemblyAnnotatorVersion>
-    <XunitAnalyzersVersion>1.2.0-pre.27</XunitAnalyzersVersion>
-    <XunitVersion>2.5.0-pre.37</XunitVersion>
+    <XunitAnalyzersVersion>1.2.0-pre.48</XunitAnalyzersVersion>
+    <XunitVersion>2.5.0-pre.43</XunitVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/src/xunit.runner.visualstudio/VsTestRunner.cs b/src/xunit.runner.visualstudio/VsTestRunner.cs
index 3d5e1cf1..af05cc75 100644
--- a/src/xunit.runner.visualstudio/VsTestRunner.cs
+++ b/src/xunit.runner.visualstudio/VsTestRunner.cs
@@ -578,6 +578,11 @@ void RunTestsInAssembly(
 				resultsSink.Finished.WaitOne();
 
 				reporterMessageHandler.OnMessage(new TestAssemblyExecutionFinished(assembly, executionOptions, resultsSink.ExecutionSummary));
+				if (resultsSink.ExecutionSummary.Failed != 0 && executionOptions.GetStopOnTestFailOrDefault())
+				{
+					logger.Log("Canceling due to test failure...");
+					cancelled = true;
+				}
 			}
 			catch (Exception ex)
 			{