diff --git a/build/Targets/Packages.props b/build/Targets/Packages.props
index 159b1d5660335832df3c0887cb239ab53264bdcf..9ef34972b8901cfd92090cc1f39e5bdd357fbb4b 100644
--- a/build/Targets/Packages.props
+++ b/build/Targets/Packages.props
@@ -34,7 +34,6 @@
     <CommandLineParserVersion>2.0.273-beta</CommandLineParserVersion>
     <EnvDTEVersion>8.0.2</EnvDTEVersion>
     <EnvDTE80Version>8.0.0</EnvDTE80Version>
-    <dotnetxunitVersion>2.3.1</dotnetxunitVersion>
     <FakeSignVersion>0.9.2</FakeSignVersion>
     <HumanizerCoreVersion>2.2.0</HumanizerCoreVersion>
     <ICSharpCodeDecompilerVersion>4.0.0.4285-beta1</ICSharpCodeDecompilerVersion>
@@ -251,12 +250,12 @@
     <VsWebsiteInteropVersion>8.0.50727</VsWebsiteInteropVersion>
     <vswhereVersion>2.4.1</vswhereVersion>
     <XliffTasksVersion>0.2.0-beta-63004-01</XliffTasksVersion>
-    <xunitVersion>2.3.1</xunitVersion>
-    <xunitanalyzersVersion>0.8.0</xunitanalyzersVersion>
-    <xunitassertVersion>2.3.1</xunitassertVersion>
-    <xunitrunnerconsoleVersion>2.3.1</xunitrunnerconsoleVersion>
+    <xunitVersion>2.4.1-pre.build.4059</xunitVersion>
+    <xunitanalyzersVersion>0.10.0</xunitanalyzersVersion>
+    <xunitassertVersion>2.4.1-pre.build.4059</xunitassertVersion>
+    <xunitrunnerconsoleVersion>2.4.1-pre.build.4059</xunitrunnerconsoleVersion>
     <xunitrunnerwpfVersion>1.0.51</xunitrunnerwpfVersion>
-    <xunitrunnervisualstudioVersion>2.3.1</xunitrunnervisualstudioVersion>
+    <xunitrunnervisualstudioVersion>2.4.1-pre.build.4059</xunitrunnervisualstudioVersion>
   </PropertyGroup>
 
   <!-- 
diff --git a/build/ToolsetPackages/RoslynToolset.csproj b/build/ToolsetPackages/RoslynToolset.csproj
index 5ed599b0fb9ae6fd4d75f26802a82eefe401c166..62d35766b3fa8c2f70cc3bb9b98b98d4e3b48202 100644
--- a/build/ToolsetPackages/RoslynToolset.csproj
+++ b/build/ToolsetPackages/RoslynToolset.csproj
@@ -36,7 +36,6 @@
     <PackageReference Include="vswhere" Version="$(vswhereVersion)" ExcludeAssets="all" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
-    <PackageReference Include="dotnet-xunit" Version="$(dotnetxunitVersion)" ExcludeAssets="all" />
     <PackageReference Include="Microsoft.NETCore.Compilers" Version="$(MicrosoftNETCoreCompilersVersion)" ExcludeAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/build/scripts/tests.sh b/build/scripts/tests.sh
index f318cd0d20731fd0125f2599c61cea38c994c817..b494009e3facc1d96deb5f667c5ea47178d29be9 100755
--- a/build/scripts/tests.sh
+++ b/build/scripts/tests.sh
@@ -16,7 +16,7 @@ binaries_path="${root_path}"/Binaries
 unittest_dir="${binaries_path}"/"${build_configuration}"/UnitTests
 log_dir="${binaries_path}"/"${build_configuration}"/xUnitResults
 nuget_dir="${HOME}"/.nuget/packages
-xunit_console_version="$(get_package_version dotnet-xunit)"
+xunit_console_version="$(get_package_version xunitrunnerconsole)"
 
 if [[ "${runtime}" == "dotnet" ]]; then
     target_framework=netcoreapp2.0
diff --git a/src/EditorFeatures/TestUtilities/Threading/WpfFactDiscoverer.cs b/src/EditorFeatures/TestUtilities/Threading/WpfFactDiscoverer.cs
index d07c5e7888572fb11629d8bd457c94a9c61f8b53..07da6980e24d956fd87ea087254a393472ef554b 100644
--- a/src/EditorFeatures/TestUtilities/Threading/WpfFactDiscoverer.cs
+++ b/src/EditorFeatures/TestUtilities/Threading/WpfFactDiscoverer.cs
@@ -16,7 +16,7 @@ public WpfFactDiscoverer(IMessageSink diagnosticMessageSink) : base(diagnosticMe
         }
 
         protected override IXunitTestCase CreateTestCase(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, IAttributeInfo factAttribute)
-            => new WpfTestCase(_diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod);
+            => new WpfTestCase(_diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), discoveryOptions.MethodDisplayOptionsOrDefault(), testMethod);
     }
 
     public class WpfTheoryDiscoverer : TheoryDiscoverer
@@ -30,13 +30,13 @@ public WpfTheoryDiscoverer(IMessageSink diagnosticMessageSink) : base(diagnostic
 
         protected override IEnumerable<IXunitTestCase> CreateTestCasesForDataRow(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, IAttributeInfo theoryAttribute, object[] dataRow)
         {
-            var testCase = new WpfTestCase(_diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod, dataRow);
+            var testCase = new WpfTestCase(_diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), discoveryOptions.MethodDisplayOptionsOrDefault(), testMethod, dataRow);
             return new[] { testCase };
         }
 
         protected override IEnumerable<IXunitTestCase> CreateTestCasesForTheory(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, IAttributeInfo theoryAttribute)
         {
-            var testCase = new WpfTheoryTestCase(_diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod);
+            var testCase = new WpfTheoryTestCase(_diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), discoveryOptions.MethodDisplayOptionsOrDefault(), testMethod);
             return new[] { testCase };
         }
     }
diff --git a/src/EditorFeatures/TestUtilities/Threading/WpfTestCase.cs b/src/EditorFeatures/TestUtilities/Threading/WpfTestCase.cs
index 187b7677d15702282376e8d90ea9b805984735d1..b3adeab12514b994272d33bf935b833341b1f972 100644
--- a/src/EditorFeatures/TestUtilities/Threading/WpfTestCase.cs
+++ b/src/EditorFeatures/TestUtilities/Threading/WpfTestCase.cs
@@ -18,13 +18,13 @@ public sealed class WpfTestCase : XunitTestCase
         public WpfTestCase()
         {
         }
- 
-        public WpfTestCase(IMessageSink diagnosticMessageSink, TestMethodDisplay defaultMethodDisplay, ITestMethod testMethod, object[] testMethodArguments = null)
-            : base(diagnosticMessageSink, defaultMethodDisplay, testMethod, testMethodArguments)
+
+        public WpfTestCase(IMessageSink diagnosticMessageSink, TestMethodDisplay defaultMethodDisplay, TestMethodDisplayOptions defaultMethodDisplayOptions, ITestMethod testMethod, object[] testMethodArguments = null)
+            : base(diagnosticMessageSink, defaultMethodDisplay, defaultMethodDisplayOptions, testMethod, testMethodArguments)
         {
             SharedData = WpfTestSharedData.Instance;
         }
- 
+
         public override Task<RunSummary> RunAsync(IMessageSink diagnosticMessageSink, IMessageBus messageBus, object[] constructorArguments, ExceptionAggregator aggregator, CancellationTokenSource cancellationTokenSource)
         {
             var runner = new WpfTestCaseRunner(SharedData, this, DisplayName, SkipReason, constructorArguments, TestMethodArguments, messageBus, aggregator, cancellationTokenSource);
diff --git a/src/EditorFeatures/TestUtilities/Threading/WpfTheoryTestCase.cs b/src/EditorFeatures/TestUtilities/Threading/WpfTheoryTestCase.cs
index d063e931f3609862a4c2781bbd5102b4c2e633cf..2a0e474df397cdb8f33d7c46c9b83802b1ca4458 100644
--- a/src/EditorFeatures/TestUtilities/Threading/WpfTheoryTestCase.cs
+++ b/src/EditorFeatures/TestUtilities/Threading/WpfTheoryTestCase.cs
@@ -17,8 +17,8 @@ public class WpfTheoryTestCase : XunitTheoryTestCase
         [Obsolete("Called by the de-serializer; should only be called by deriving classes for de-serialization purposes")]
         public WpfTheoryTestCase() { }
 
-        public WpfTheoryTestCase(IMessageSink diagnosticMessageSink, TestMethodDisplay defaultMethodDisplay, ITestMethod testMethod)
-            : base(diagnosticMessageSink, defaultMethodDisplay, testMethod)
+        public WpfTheoryTestCase(IMessageSink diagnosticMessageSink, TestMethodDisplay defaultMethodDisplay, TestMethodDisplayOptions defaultMethodDisplayOptions, ITestMethod testMethod)
+            : base(diagnosticMessageSink, defaultMethodDisplay, defaultMethodDisplayOptions, testMethod)
         {
             SharedData = WpfTestSharedData.Instance;
         }