diff --git a/build/dependencies.props b/build/dependencies.props
index aabdda911a..91e0035544 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -11,20 +11,21 @@
     <NETStandardImplicitPackageVersion>2.0.0-*</NETStandardImplicitPackageVersion>
     <NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion>
     <RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion>
-    
+
     <!--
       Re-enable package downgrade warnings when RoslynDevVersion >= RoslynVersion
       - https://github.com/aspnet/Razor/issues/1577
     -->
     <RoslynVersion>2.3.1</RoslynVersion>
     <RoslynDevVersion>2.3.0-beta4-*</RoslynDevVersion>
-    
+
     <StreamJsonRpcVersion>1.1.92</StreamJsonRpcVersion>
-    <TestSdkVersion>15.3.0-*</TestSdkVersion>
+    <TestSdkVersion>15.3.0</TestSdkVersion>
 
     <!-- Must keep in sync with tooling\Microsoft.VisualStudio.RazorExtension\project.json -->
     <VsShellVersion>15.0.26606</VsShellVersion>
-    
-    <XunitVersion>2.3.0-beta2-*</XunitVersion>
+
+    <XunitAnalyzersVersion>0.6.1</XunitAnalyzersVersion>
+    <XunitVersion>2.3.0-beta4-build3742</XunitVersion>
   </PropertyGroup>
 </Project>
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTagsTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTagsTest.cs
index de689a4eb2..c1b3b1a688 100644
--- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTagsTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTagsTest.cs
@@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     public class HtmlTagsTest : CsHtmlMarkupParserTestBase
     {
-        public static IEnumerable<string[]> VoidElementNames
+        public static IEnumerable<object[]> VoidElementNames
         {
             get
             {
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/SourceChangeTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/SourceChangeTest.cs
index 5b4c1a14bd..f3f1b9320e 100644
--- a/test/Microsoft.AspNetCore.Razor.Language.Test/SourceChangeTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/SourceChangeTest.cs
@@ -137,13 +137,8 @@ namespace Microsoft.AspNetCore.Razor.Language
             Assert.Equal(2, result);
         }
 
-        [Theory]
-        [InlineData(12, 2)]
-        [InlineData(12, 14)]
-        [InlineData(13, 13)]
-        [InlineData(20, 1)]
-        [InlineData(21, 0)]
-        public void GetOffSet_SpanIsNotOwnerOfChange_ThrowsException(int absoluteIndex, int length)
+        [Fact]
+        public void GetOffSet_SpanIsNotOwnerOfChange_ThrowsException()
         {
             // Arrange
             var builder = new SpanBuilder(new SourceLocation(13, 0, 0));
diff --git a/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj b/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
index 9a218a059d..51aa42ec8d 100644
--- a/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
+++ b/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
@@ -13,6 +13,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(DependencyModelVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Editor/RazorSyntaxTreePartialParserTest.cs b/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Editor/RazorSyntaxTreePartialParserTest.cs
index aa11e1dbf2..a3f98ea6ac 100644
--- a/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Editor/RazorSyntaxTreePartialParserTest.cs
+++ b/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Editor/RazorSyntaxTreePartialParserTest.cs
@@ -17,69 +17,20 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor.Editor
         {
             get
             {
-                // change, (Block)expectedDocument
-                return new TheoryData<TestEdit, MarkupBlock>
+                return new TheoryData<TestEdit>
                 {
-                    {
-                        CreateInsertionChange("<p></p>", 2, " "),
-                        new MarkupBlock(
-                            new MarkupTagHelperBlock("p"))
-                    },
-                    {
-                        CreateInsertionChange("<p></p>", 6, " "),
-                        new MarkupBlock(
-                            new MarkupTagHelperBlock("p"))
-                    },
-                    {
-                        CreateInsertionChange("<p some-attr></p>", 12, " "),
-                        new MarkupBlock(
-                            new MarkupTagHelperBlock(
-                                "p",
-                                attributes: new List<TagHelperAttributeNode>
-                                {
-                                    new TagHelperAttributeNode(
-                                        "some-attr",
-                                        value: null,
-                                        attributeStructure: AttributeStructure.Minimized)
-                                }))
-                    },
-                    {
-                        CreateInsertionChange("<p some-attr></p>", 12, "ibute"),
-                        new MarkupBlock(
-                            new MarkupTagHelperBlock(
-                                "p",
-                                attributes: new List<TagHelperAttributeNode>
-                                {
-                                    new TagHelperAttributeNode(
-                                        "some-attribute",
-                                        value: null,
-                                        attributeStructure: AttributeStructure.Minimized)
-                                }))
-                    },
-                    {
-                        CreateInsertionChange("<p some-attr></p>", 2, " before"),
-                        new MarkupBlock(
-                            new MarkupTagHelperBlock(
-                                "p",
-                                attributes: new List<TagHelperAttributeNode>
-                                {
-                                    new TagHelperAttributeNode(
-                                        "before",
-                                        value: null,
-                                        attributeStructure: AttributeStructure.Minimized),
-                                    new TagHelperAttributeNode(
-                                        "some-attr",
-                                        value: null,
-                                        attributeStructure: AttributeStructure.Minimized)
-                                }))
-                    },
+                    CreateInsertionChange("<p></p>", 2, " "),
+                    CreateInsertionChange("<p></p>", 6, " "),
+                    CreateInsertionChange("<p some-attr></p>", 12, " "),
+                    CreateInsertionChange("<p some-attr></p>", 12, "ibute"),
+                    CreateInsertionChange("<p some-attr></p>", 2, " before"),
                 };
             }
         }
 
         [Theory]
         [MemberData(nameof(TagHelperPartialParseRejectData))]
-        public void TagHelperTagBodiesRejectPartialChanges(object objectEdit, object expectedDocument)
+        public void TagHelperTagBodiesRejectPartialChanges(object objectEdit)
         {
             // Arrange
             var edit = (TestEdit)objectEdit;
@@ -112,108 +63,26 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor.Editor
                 var factory = new SpanFactory();
 
                 // change, (Block)expectedDocument, partialParseResult
-                return new TheoryData<TestEdit, MarkupBlock, PartialParseResultInternal>
+                return new TheoryData<TestEdit, PartialParseResultInternal>
                 {
                     {
                         CreateInsertionChange("<p str-attr='@DateTime'></p>", 22, "."),
-                        new MarkupBlock(
-                            new MarkupTagHelperBlock(
-                                "p",
-                                attributes: new List<TagHelperAttributeNode>
-                                {
-                                    new TagHelperAttributeNode(
-                                        "str-attr",
-                                        new MarkupBlock(
-                                            new MarkupBlock(
-                                                new ExpressionBlock(
-                                                    factory.CodeTransition(),
-                                                    factory
-                                                        .Code("DateTime.")
-                                                        .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                                                        .Accepts(AcceptedCharactersInternal.NonWhiteSpace)))),
-                                        AttributeStructure.SingleQuotes)
-                                })),
                         PartialParseResultInternal.Accepted | PartialParseResultInternal.Provisional
                     },
                     {
                         CreateInsertionChange("<p obj-attr='DateTime'></p>", 21, "."),
-                        new MarkupBlock(
-                            new MarkupTagHelperBlock(
-                                "p",
-                                attributes: new List<TagHelperAttributeNode>
-                                {
-                                    new TagHelperAttributeNode(
-                                        "obj-attr",
-                                        factory.CodeMarkup("DateTime."),
-                                        AttributeStructure.SingleQuotes)
-                                })),
                         PartialParseResultInternal.Accepted
                     },
                     {
                         CreateInsertionChange("<p obj-attr='1 + DateTime'></p>", 25, "."),
-                        new MarkupBlock(
-                            new MarkupTagHelperBlock(
-                                "p",
-                                attributes: new List<TagHelperAttributeNode>
-                                {
-                                    new TagHelperAttributeNode(
-                                        "obj-attr",
-                                        factory.CodeMarkup("1 + DateTime."),
-                                        AttributeStructure.SingleQuotes)
-                                })),
                         PartialParseResultInternal.Accepted
                     },
                     {
                         CreateInsertionChange("<p before-attr str-attr='@DateTime' after-attr></p>", 34, "."),
-                        new MarkupBlock(
-                            new MarkupTagHelperBlock(
-                                "p",
-                                attributes: new List<TagHelperAttributeNode>
-                                {
-                                    new TagHelperAttributeNode(
-                                        "before-attr",
-                                        value: null,
-                                        attributeStructure: AttributeStructure.Minimized),
-                                    new TagHelperAttributeNode(
-                                        "str-attr",
-                                        new MarkupBlock(
-                                            new MarkupBlock(
-                                                new ExpressionBlock(
-                                                    factory.CodeTransition(),
-                                                    factory
-                                                        .Code("DateTime.")
-                                                        .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                                                        .Accepts(AcceptedCharactersInternal.NonWhiteSpace)))),
-                                        AttributeStructure.SingleQuotes),
-                                    new TagHelperAttributeNode(
-                                        "after-attr",
-                                        value: null,
-                                        attributeStructure: AttributeStructure.Minimized),
-                                })),
                         PartialParseResultInternal.Accepted | PartialParseResultInternal.Provisional
                     },
                     {
                         CreateInsertionChange("<p str-attr='before @DateTime after'></p>", 29, "."),
-                        new MarkupBlock(
-                            new MarkupTagHelperBlock(
-                                "p",
-                                attributes: new List<TagHelperAttributeNode>
-                                {
-                                    new TagHelperAttributeNode(
-                                        "str-attr",
-                                        new MarkupBlock(
-                                            factory.Markup("before"),
-                                            new MarkupBlock(
-                                                factory.Markup(" "),
-                                                new ExpressionBlock(
-                                                    factory.CodeTransition(),
-                                                    factory
-                                                        .Code("DateTime.")
-                                                        .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                                                        .Accepts(AcceptedCharactersInternal.NonWhiteSpace))),
-                                            factory.Markup(" after")),
-                                        AttributeStructure.SingleQuotes)
-                                })),
                         PartialParseResultInternal.Accepted | PartialParseResultInternal.Provisional
                     },
                 };
@@ -222,10 +91,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor.Editor
 
         [Theory]
         [MemberData(nameof(TagHelperAttributeAcceptData))]
-        public void TagHelperAttributesAreLocatedAndAcceptChangesCorrectly(
-            object editObject,
-            object expectedDocument,
-            object partialParseResultObject)
+        public void TagHelperAttributesAreLocatedAndAcceptChangesCorrectly(object editObject, object partialParseResultObject)
         {
             // Arrange
             var edit = (TestEdit)editObject;
diff --git a/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Legacy/RazorEditorParserTest.cs b/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Legacy/RazorEditorParserTest.cs
index d78d8b6807..0f6e3e32e9 100644
--- a/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Legacy/RazorEditorParserTest.cs
+++ b/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Legacy/RazorEditorParserTest.cs
@@ -23,69 +23,20 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
         {
             get
             {
-                // change, (Block)expectedDocument
-                return new TheoryData<TestEdit, MarkupBlock>
+                return new TheoryData<TestEdit>
                 {
-                    {
-                        CreateInsertionChange("<p></p>", 2, " "),
-                        new MarkupBlock(
-                            new MarkupTagHelperBlock("p"))
-                    },
-                    {
-                        CreateInsertionChange("<p></p>", 6, " "),
-                        new MarkupBlock(
-                            new MarkupTagHelperBlock("p"))
-                    },
-                    {
-                        CreateInsertionChange("<p some-attr></p>", 12, " "),
-                        new MarkupBlock(
-                            new MarkupTagHelperBlock(
-                                "p",
-                                attributes: new List<TagHelperAttributeNode>
-                                {
-                                    new TagHelperAttributeNode(
-                                        "some-attr",
-                                        value: null,
-                                        attributeStructure: AttributeStructure.Minimized)
-                                }))
-                    },
-                    {
-                        CreateInsertionChange("<p some-attr></p>", 12, "ibute"),
-                        new MarkupBlock(
-                            new MarkupTagHelperBlock(
-                                "p",
-                                attributes: new List<TagHelperAttributeNode>
-                                {
-                                    new TagHelperAttributeNode(
-                                        "some-attribute",
-                                        value: null,
-                                        attributeStructure: AttributeStructure.Minimized)
-                                }))
-                    },
-                    {
-                        CreateInsertionChange("<p some-attr></p>", 2, " before"),
-                        new MarkupBlock(
-                            new MarkupTagHelperBlock(
-                                "p",
-                                attributes: new List<TagHelperAttributeNode>
-                                {
-                                    new TagHelperAttributeNode(
-                                        "before",
-                                        value: null,
-                                        attributeStructure: AttributeStructure.Minimized),
-                                    new TagHelperAttributeNode(
-                                        "some-attr",
-                                        value: null,
-                                        attributeStructure: AttributeStructure.Minimized)
-                                }))
-                    },
+                    CreateInsertionChange("<p></p>", 2, " "),
+                    CreateInsertionChange("<p></p>", 6, " "),
+                    CreateInsertionChange("<p some-attr></p>", 12, " "),
+                    CreateInsertionChange("<p some-attr></p>", 12, "ibute"),
+                    CreateInsertionChange("<p some-attr></p>", 2, " before"),
                 };
             }
         }
 
         [Theory]
         [MemberData(nameof(TagHelperPartialParseRejectData))]
-        public void TagHelperTagBodiesRejectPartialChanges(object editObject, object expectedDocument)
+        public void TagHelperTagBodiesRejectPartialChanges(object editObject)
         {
             // Arrange
             var edit = (TestEdit)editObject;
@@ -119,108 +70,26 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
                 var factory = new SpanFactory();
 
                 // change, (Block)expectedDocument, partialParseResult
-                return new TheoryData<TestEdit, MarkupBlock, PartialParseResult>
+                return new TheoryData<TestEdit, PartialParseResult>
                 {
                     {
                         CreateInsertionChange("<p str-attr='@DateTime'></p>", 22, "."),
-                        new MarkupBlock(
-                            new MarkupTagHelperBlock(
-                                "p",
-                                attributes: new List<TagHelperAttributeNode>
-                                {
-                                    new TagHelperAttributeNode(
-                                        "str-attr",
-                                        new MarkupBlock(
-                                            new MarkupBlock(
-                                                new ExpressionBlock(
-                                                    factory.CodeTransition(),
-                                                    factory
-                                                        .Code("DateTime.")
-                                                        .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                                                        .Accepts(AcceptedCharactersInternal.NonWhiteSpace)))),
-                                        AttributeStructure.SingleQuotes)
-                                })),
                         PartialParseResult.Accepted | PartialParseResult.Provisional
                     },
                     {
                         CreateInsertionChange("<p obj-attr='DateTime'></p>", 21, "."),
-                        new MarkupBlock(
-                            new MarkupTagHelperBlock(
-                                "p",
-                                attributes: new List<TagHelperAttributeNode>
-                                {
-                                    new TagHelperAttributeNode(
-                                        "obj-attr",
-                                        factory.CodeMarkup("DateTime."),
-                                        AttributeStructure.SingleQuotes)
-                                })),
                         PartialParseResult.Accepted
                     },
                     {
                         CreateInsertionChange("<p obj-attr='1 + DateTime'></p>", 25, "."),
-                        new MarkupBlock(
-                            new MarkupTagHelperBlock(
-                                "p",
-                                attributes: new List<TagHelperAttributeNode>
-                                {
-                                    new TagHelperAttributeNode(
-                                        "obj-attr",
-                                        factory.CodeMarkup("1 + DateTime."),
-                                        AttributeStructure.SingleQuotes)
-                                })),
                         PartialParseResult.Accepted
                     },
                     {
                         CreateInsertionChange("<p before-attr str-attr='@DateTime' after-attr></p>", 34, "."),
-                        new MarkupBlock(
-                            new MarkupTagHelperBlock(
-                                "p",
-                                attributes: new List<TagHelperAttributeNode>
-                                {
-                                    new TagHelperAttributeNode(
-                                        "before-attr",
-                                        value: null,
-                                        attributeStructure: AttributeStructure.Minimized),
-                                    new TagHelperAttributeNode(
-                                        "str-attr",
-                                        new MarkupBlock(
-                                            new MarkupBlock(
-                                                new ExpressionBlock(
-                                                    factory.CodeTransition(),
-                                                    factory
-                                                        .Code("DateTime.")
-                                                        .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                                                        .Accepts(AcceptedCharactersInternal.NonWhiteSpace)))),
-                                        AttributeStructure.SingleQuotes),
-                                    new TagHelperAttributeNode(
-                                        "after-attr",
-                                        value: null,
-                                        attributeStructure: AttributeStructure.Minimized),
-                                })),
                         PartialParseResult.Accepted | PartialParseResult.Provisional
                     },
                     {
                         CreateInsertionChange("<p str-attr='before @DateTime after'></p>", 29, "."),
-                        new MarkupBlock(
-                            new MarkupTagHelperBlock(
-                                "p",
-                                attributes: new List<TagHelperAttributeNode>
-                                {
-                                    new TagHelperAttributeNode(
-                                        "str-attr",
-                                        new MarkupBlock(
-                                            factory.Markup("before"),
-                                            new MarkupBlock(
-                                                factory.Markup(" "),
-                                                new ExpressionBlock(
-                                                    factory.CodeTransition(),
-                                                    factory
-                                                        .Code("DateTime.")
-                                                        .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                                                        .Accepts(AcceptedCharactersInternal.NonWhiteSpace))),
-                                            factory.Markup(" after")),
-                                        AttributeStructure.SingleQuotes)
-                                })),
                         PartialParseResult.Accepted | PartialParseResult.Provisional
                     },
                 };
@@ -229,10 +98,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
 
         [Theory]
         [MemberData(nameof(TagHelperAttributeAcceptData))]
-        public void TagHelperAttributesAreLocatedAndAcceptChangesCorrectly(
-            object editObject,
-            object expectedDocument,
-            PartialParseResult partialParseResult)
+        public void TagHelperAttributesAreLocatedAndAcceptChangesCorrectly(object editObject, PartialParseResult partialParseResult)
         {
             // Arrange
             var edit = (TestEdit)editObject;
diff --git a/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj b/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj
index 8cb0d62822..b980d10aed 100644
--- a/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj
+++ b/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj
@@ -22,7 +22,9 @@
     <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(RoslynDevVersion)" NoWarn="NU1605" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynDevVersion)" NoWarn="NU1605" />
 
+    <PackageReference Include="xunit.analyzers" Version="$(XunitAnalyzersVersion)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitVersion)" />
   </ItemGroup>
 
 </Project>