diff --git a/build/dependencies.props b/build/dependencies.props
index 0a6c8d6eb5..226b77c333 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -4,7 +4,7 @@
     <InternalAspNetCoreSdkVersion>2.1.0-*</InternalAspNetCoreSdkVersion>
     <MoqVersion>4.7.1</MoqVersion>
     <NETStandardImplicitPackageVersion>$(BundledNETStandardPackageVersion)</NETStandardImplicitPackageVersion>
-    <TestSdkVersion>15.0.0</TestSdkVersion>
-    <XunitVersion>2.2.0</XunitVersion>
+    <TestSdkVersion>15.3.0-*</TestSdkVersion>
+    <XunitVersion>2.3.0-beta2-*</XunitVersion>
   </PropertyGroup>
 </Project>
diff --git a/test/Microsoft.AspNetCore.HttpOverrides.Tests/IPEndPointParserTest.cs b/test/Microsoft.AspNetCore.HttpOverrides.Tests/IPEndPointParserTest.cs
index f5106bd2a7..11d13c401d 100644
--- a/test/Microsoft.AspNetCore.HttpOverrides.Tests/IPEndPointParserTest.cs
+++ b/test/Microsoft.AspNetCore.HttpOverrides.Tests/IPEndPointParserTest.cs
@@ -25,6 +25,7 @@ namespace Microsoft.AspNetCore.HttpOverrides.Internal
             Assert.Equal(expectedPort, endpoint.Port);
         }
 
+        [Theory]
         [InlineData(null)]
         [InlineData("[::1]:")]
         [InlineData("[::1:")]
@@ -40,7 +41,7 @@ namespace Microsoft.AspNetCore.HttpOverrides.Internal
             IPEndPoint endpoint;
             var success = IPEndPointParser.TryParse(input, out endpoint);
             Assert.False(success);
-            Assert.Equal(null, endpoint);
+            Assert.Null(endpoint);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/MiddleWareTests.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/MiddleWareTests.cs
index 542cd88060..ce146b1df1 100644
--- a/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/MiddleWareTests.cs
+++ b/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/MiddleWareTests.cs
@@ -342,7 +342,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite
 
             var response = await server.CreateClient().GetAsync("");
 
-            Assert.Equal(response.Headers.Location.OriginalString, "/foo");
+            Assert.Equal("/foo", response.Headers.Location.OriginalString);
         }
 
         [Theory]
@@ -570,7 +570,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite
             var condition = new UriMatchCondition(
                 inputParser,
                 "{REQUEST_URI}",
-                conditionInputPattern, 
+                conditionInputPattern,
                 uriMatchPart,
                 ignoreCase: true,
                 negate: false);
@@ -578,8 +578,8 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite
             ruleBuilder.AddUrlCondition(condition);
 
             var action = new RewriteAction(
-                RuleResult.SkipRemainingRules, 
-                inputParser.ParseInputString(@"http://www.test.com{C:1}", uriMatchPart), 
+                RuleResult.SkipRemainingRules,
+                inputParser.ParseInputString(@"http://www.test.com{C:1}", uriMatchPart),
                 queryStringAppend: false);
             ruleBuilder.AddUrlAction(action);
 
diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/UrlRewriteApplicationTests.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/UrlRewriteApplicationTests.cs
index ff9e9f8a59..ecc753a620 100644
--- a/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/UrlRewriteApplicationTests.cs
+++ b/test/Microsoft.AspNetCore.Rewrite.Tests/IISUrlRewrite/UrlRewriteApplicationTests.cs
@@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite
                 </rewrite>");
             var rules = new UrlRewriteFileParser().Parse(xml);
 
-            Assert.Equal(rules.Count, 1);
+            Assert.Equal(1, rules.Count);
             var context = new RewriteContext { HttpContext = new DefaultHttpContext() };
             rules.FirstOrDefault().ApplyRule(context);
             Assert.Equal(RuleResult.SkipRemainingRules, context.Result);
@@ -44,7 +44,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite
                 </rewrite>");
             var rules = new UrlRewriteFileParser().Parse(xml);
 
-            Assert.Equal(rules.Count, 1);
+            Assert.Equal(1, rules.Count);
             var context = new RewriteContext { HttpContext = new DefaultHttpContext() };
             rules.FirstOrDefault().ApplyRule(context);
             Assert.Equal(RuleResult.ContinueRules, context.Result);
@@ -66,7 +66,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.UrlRewrite
                 </rewrite>");
             var rules = new UrlRewriteFileParser().Parse(xml);
 
-            Assert.Equal(rules.Count, 1);
+            Assert.Equal(1, rules.Count);
             Assert.True(rules[0].Conditions.TrackAllCaptures);
             var context = new RewriteContext { HttpContext = new DefaultHttpContext() };
             rules.FirstOrDefault().ApplyRule(context);
diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/MiddlewareTests.cs b/test/Microsoft.AspNetCore.Rewrite.Tests/MiddlewareTests.cs
index 74f4e599d8..137448b1e7 100644
--- a/test/Microsoft.AspNetCore.Rewrite.Tests/MiddlewareTests.cs
+++ b/test/Microsoft.AspNetCore.Rewrite.Tests/MiddlewareTests.cs
@@ -120,7 +120,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.CodeRules
             var server = new TestServer(builder);
 
             var response = await server.CreateClient().GetAsync("");
-            Assert.Equal(response.Headers.Location.OriginalString, "/");
+            Assert.Equal("/", response.Headers.Location.OriginalString);
         }
 
         [Fact]
@@ -139,7 +139,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.CodeRules
 
             var response = await server.CreateClient().GetStringAsync("");
 
-            Assert.Equal(response, "/");
+            Assert.Equal("/", response);
         }
 
         [Fact]
@@ -158,7 +158,7 @@ namespace Microsoft.AspNetCore.Rewrite.Tests.CodeRules
 
             var response = await server.CreateClient().GetAsync("");
 
-            Assert.Equal(response.Headers.Location.OriginalString, "/foo");
+            Assert.Equal("/foo", response.Headers.Location.OriginalString);
         }
     }
 }