diff --git a/build/common.props b/build/common.props
index a048198bf3..0229049141 100644
--- a/build/common.props
+++ b/build/common.props
@@ -11,6 +11,8 @@
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
     <VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <!-- ignore failures in xunit.analyzers 0.6.1 -->
+    <NoWarn>$(NoWarn);AD0001</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/build/dependencies.props b/build/dependencies.props
index a7de3e4e3f..71f76db82a 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -5,7 +5,8 @@
     <InternalAspNetCoreSdkVersion>2.1.1-*</InternalAspNetCoreSdkVersion>
     <NETStandardImplicitPackageVersion>2.0.0-*</NETStandardImplicitPackageVersion>
     <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.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs b/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs
index dcaace1874..b2ba4a4f47 100644
--- a/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs
+++ b/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs
@@ -146,12 +146,12 @@ namespace Microsoft.AspNetCore.StaticFiles
                     Assert.Equal(HttpStatusCode.OK, response.StatusCode);
                     Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
                     Assert.True(response.Content.Headers.ContentLength == fileInfo.Length);
-                    Assert.Equal(0, (await response.Content.ReadAsByteArrayAsync()).Length);
+                    Assert.Empty((await response.Content.ReadAsByteArrayAsync()));
                 }
             }
         }
 
-        public static IEnumerable<string[]> ExistingFiles => new[]
+        public static IEnumerable<object[]> ExistingFiles => new[]
         {
             new[] {"", @".", "/TestDocument.txt"},
             new[] {"/somedir", @".", "/somedir/TestDocument.txt"},
diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/CacheHeaderTests.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/CacheHeaderTests.cs
index bb83365fcb..862346a9d8 100644
--- a/test/Microsoft.AspNetCore.StaticFiles.Tests/CacheHeaderTests.cs
+++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/CacheHeaderTests.cs
@@ -412,13 +412,13 @@ namespace Microsoft.AspNetCore.StaticFiles
         }
 
 
-        public static IEnumerable<object> SupportedMethods => new[]
+        public static IEnumerable<object[]> SupportedMethods => new[]
         {
             new [] { HttpMethod.Get },
             new [] { HttpMethod.Head }
         };
 
-        public static IEnumerable<object> UnsupportedMethods => new[]
+        public static IEnumerable<object[]> UnsupportedMethods => new[]
         {
             new [] { HttpMethod.Post },
             new [] { HttpMethod.Put },
diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs
index c8ca085aca..e50557f277 100644
--- a/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs
+++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs
@@ -142,7 +142,7 @@ namespace Microsoft.AspNetCore.StaticFiles
 
                 Assert.Equal(HttpStatusCode.Moved, response.StatusCode);
                 Assert.Equal(requestUrl + "/" + queryString, response.Headers.GetValues("Location").FirstOrDefault());
-                Assert.Equal(0, (await response.Content.ReadAsByteArrayAsync()).Length);
+                Assert.Empty((await response.Content.ReadAsByteArrayAsync()));
             }
         }
 
diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs
index c1aff43907..2a12c85486 100644
--- a/test/Microsoft.AspNetCore.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs
+++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs
@@ -165,7 +165,7 @@ namespace Microsoft.AspNetCore.StaticFiles
 
                 Assert.Equal(HttpStatusCode.Moved, response.StatusCode);
                 Assert.Equal(requestUrl + "/" + queryString, response.Headers.GetValues("Location").FirstOrDefault());
-                Assert.Equal(0, (await response.Content.ReadAsByteArrayAsync()).Length);
+                Assert.Empty((await response.Content.ReadAsByteArrayAsync()));
             }
         }
 
@@ -241,7 +241,7 @@ namespace Microsoft.AspNetCore.StaticFiles
                 Assert.Equal(HttpStatusCode.OK, response.StatusCode);
                 Assert.Equal("text/html; charset=utf-8", response.Content.Headers.ContentType.ToString());
                 Assert.True(response.Content.Headers.ContentLength == 0);
-                Assert.Equal(0, (await response.Content.ReadAsByteArrayAsync()).Length);
+                Assert.Empty((await response.Content.ReadAsByteArrayAsync()));
             }
         }
     }
diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj b/test/Microsoft.AspNetCore.StaticFiles.Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj
index 17d3e8dbb4..ca1260e87b 100644
--- a/test/Microsoft.AspNetCore.StaticFiles.Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj
+++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj
@@ -23,6 +23,7 @@
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
+    <PackageReference Include="xunit.analyzers" Version="$(XunitAnalyzersVersion)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
     <PackageReference Include="xunit" Version="$(XunitVersion)" />
   </ItemGroup>
diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileMiddlewareTests.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileMiddlewareTests.cs
index d1630ce55b..7517782e51 100644
--- a/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileMiddlewareTests.cs
+++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileMiddlewareTests.cs
@@ -128,7 +128,7 @@ namespace Microsoft.AspNetCore.StaticFiles
                 Assert.Equal(HttpStatusCode.OK, response.StatusCode);
                 Assert.Equal("text/plain", response.Content.Headers.ContentType.ToString());
                 Assert.True(response.Content.Headers.ContentLength == fileInfo.Length);
-                Assert.Equal(0, (await response.Content.ReadAsByteArrayAsync()).Length);
+                Assert.Empty((await response.Content.ReadAsByteArrayAsync()));
             }
         }
 
@@ -187,7 +187,7 @@ namespace Microsoft.AspNetCore.StaticFiles
             }
         }
 
-        public static IEnumerable<string[]> MissingFiles => new[]
+        public static IEnumerable<object[]> MissingFiles => new[]
         {
             new[] {"", @".", "/missing.file"},
             new[] {"/subdir", @".", "/subdir/missing.file"},
@@ -195,7 +195,7 @@ namespace Microsoft.AspNetCore.StaticFiles
             new[] {"", @"./", "/xunit.xml"}
         };
 
-        public static IEnumerable<string[]> ExistingFiles => new[]
+        public static IEnumerable<object[]> ExistingFiles => new[]
         {
             new[] {"", @".", "/TestDocument.txt"},
             new[] {"/somedir", @".", "/somedir/TestDocument.txt"},