diff --git a/build/dependencies.props b/build/dependencies.props
index da24f009cd..340f109f60 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -8,8 +8,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>
+    <XunitVersion>2.3.0-beta4-build3742</XunitVersion>
     <SystemReflectionMetadataVersion>1.5.0-*</SystemReflectionMetadataVersion>
   </PropertyGroup>
 </Project>
diff --git a/test/Diagnostics.EFCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs b/test/Diagnostics.EFCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
index 72c839db95..9e6263fa69 100644
--- a/test/Diagnostics.EFCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
+++ b/test/Diagnostics.EFCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
@@ -335,8 +335,8 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
                 }
             });
 
-            Assert.True(logProvider.Logger.Messages.ToList().Any(m =>
-                m.StartsWith(StringsHelpers.GetResourceString("FormatDatabaseErrorPageMiddleware_ContextNotRegistered", typeof(BloggingContext)))));
+            Assert.Contains(logProvider.Logger.Messages.ToList(), m =>
+                m.StartsWith(StringsHelpers.GetResourceString("FormatDatabaseErrorPageMiddleware_ContextNotRegistered", typeof(BloggingContext))));
         }
 
         class ContextNotRegisteredInServicesMiddleware
@@ -390,8 +390,8 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
                     }
                 });
 
-                Assert.True(logProvider.Logger.Messages.ToList().Any(m =>
-                    m.StartsWith(StringsHelpers.GetResourceString("FormatDatabaseErrorPageMiddleware_Exception"))));
+                Assert.Contains(logProvider.Logger.Messages.ToList(), m =>
+                    m.StartsWith(StringsHelpers.GetResourceString("FormatDatabaseErrorPageMiddleware_Exception")));
             }
         }
 
diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmLoggerTest.cs b/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmLoggerTest.cs
index 43f778c9cb..59cef168f1 100644
--- a/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmLoggerTest.cs
+++ b/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmLoggerTest.cs
@@ -142,7 +142,7 @@ namespace Microsoft.AspNetCore.Diagnostics.Tests
             var store = t.Item2;
 
             var testThread = new TestThread(logger);
-            Thread workerThread = new Thread(testThread.work);
+            Thread workerThread = new Thread(testThread.Work);
 
             // Act
             workerThread.Start();
@@ -168,7 +168,7 @@ namespace Microsoft.AspNetCore.Diagnostics.Tests
             var store = t.Item2;
 
             var testThread = new TestThread(logger);
-            Thread workerThread = new Thread(testThread.work);
+            Thread workerThread = new Thread(testThread.Work);
 
             // Act
             workerThread.Start();
@@ -193,11 +193,11 @@ namespace Microsoft.AspNetCore.Diagnostics.Tests
                 .Root;
             Assert.NotNull(root2);
 
-            Assert.Equal(0, root1.Children.Count);
+            Assert.Empty(root1.Children);
             Assert.Equal(2, root1.Messages.Count);
-            Assert.Equal(1, root2.Children.Count);
+            Assert.Single(root2.Children);
             Assert.Equal(12, root2.Messages.Count);
-            Assert.Equal(0, root2.Children.First().Children.Count);
+            Assert.Empty(root2.Children.First().Children);
             Assert.Equal(3, root2.Children.First().Messages.Count);
         }
 
@@ -327,7 +327,7 @@ namespace Microsoft.AspNetCore.Diagnostics.Tests
                 _logger = logger;
             }
 
-            public void work()
+            public void Work()
             {
                 using (_logger.BeginScope("test12"))
                 {
diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmMiddlewareTest.cs b/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmMiddlewareTest.cs
index 69bf17471d..9a57e204b3 100644
--- a/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmMiddlewareTest.cs
+++ b/test/Microsoft.AspNetCore.Diagnostics.Tests/ElmMiddlewareTest.cs
@@ -111,7 +111,7 @@ namespace Microsoft.AspNetCore.Diagnostics.Tests
 
                 // Assert
                 contextMock.VerifyGet(c => c.Request.Query, Times.AtLeastOnce());
-                Assert.True(response.Contains("<title>ASP.NET Core Logs</title>"));
+                Assert.Contains("<title>ASP.NET Core Logs</title>", response);
             }
         }
 
@@ -156,7 +156,7 @@ namespace Microsoft.AspNetCore.Diagnostics.Tests
 
                 // Assert
                 contextMock.VerifyGet(c => c.Request.Query, Times.AtLeastOnce());
-                Assert.True(response.Contains("Invalid Id"));
+                Assert.Contains("Invalid Id", response);
             }
         }