diff --git a/build/dependencies.props b/build/dependencies.props
index 97efbe6cdc..96e0839cde 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -7,7 +7,8 @@
     <NETStandardImplicitPackageVersion>2.0.0-*</NETStandardImplicitPackageVersion>
     <NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion>
     <RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion>
-    <TestSdkVersion>15.3.0-*</TestSdkVersion>
-    <XunitVersion>2.3.0-beta2-*</XunitVersion>
+    <TestSdkVersion>15.3.0</TestSdkVersion>
+    <XunitAnalyzersVersion>0.6.1</XunitAnalyzersVersion>
+    <XunitVersion>2.3.0-beta4-build3742</XunitVersion>
   </PropertyGroup>
 </Project>
diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj b/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj
index 43eb48c89c..93d336c15a 100644
--- a/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj
+++ b/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj
@@ -21,6 +21,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="Moq" Version="$(MoqVersion)" />
     <PackageReference Include="xunit" Version="$(XunitVersion)" />
+    <PackageReference Include="xunit.analyzers" Version="$(XunitAnalyzersVersion)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
   </ItemGroup>
 
diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Tree/TreeRouterTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/Tree/TreeRouterTest.cs
index e58aee9a97..d6c90e9756 100644
--- a/test/Microsoft.AspNetCore.Routing.Tests/Tree/TreeRouterTest.cs
+++ b/test/Microsoft.AspNetCore.Routing.Tests/Tree/TreeRouterTest.cs
@@ -1819,8 +1819,8 @@ namespace Microsoft.AspNetCore.Routing.Tree
 
             Assert.Empty(context.RouteData.Routers);
 
-            Assert.Equal(1, nestedRouters.Count);
-            Assert.Equal(next.Object.GetType(), nestedRouters[0].GetType());
+            var router = Assert.Single(nestedRouters);
+            Assert.Equal(next.Object.GetType(), router.GetType());
         }
 
         [Fact]
@@ -1861,8 +1861,8 @@ namespace Microsoft.AspNetCore.Routing.Tree
 
             Assert.Empty(context.RouteData.Routers);
 
-            Assert.Equal(1, nestedRouters.Count);
-            Assert.Equal(next.Object.GetType(), nestedRouters[0].GetType());
+            var router = Assert.Single(nestedRouters);
+            Assert.Equal(next.Object.GetType(), router.GetType());
         }
 
         [Fact]