diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/FormTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/FormTagHelper.cs
index e041ae1f90..fe92d7f47f 100644
--- a/src/Microsoft.AspNet.Mvc.TagHelpers/FormTagHelper.cs
+++ b/src/Microsoft.AspNet.Mvc.TagHelpers/FormTagHelper.cs
@@ -105,7 +105,6 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
                 {
                     output.MergeAttributes(tagBuilder);
                     output.PostContent += tagBuilder.InnerHtml;
-                    output.SelfClosing = false;
                 }
             }
 
diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs
index 7af188fda3..69762d5a5f 100644
--- a/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs
+++ b/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs
@@ -203,10 +203,9 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
                 if (tagBuilder != null)
                 {
                     // This TagBuilder contains the one <input/> element of interest. Since this is not the "checkbox"
-                    // special-case, output is a self-closing element and can merge the TagBuilder in directly.
+                    // special-case, output is a self-closing element no longer guarunteed.
                     output.MergeAttributes(tagBuilder);
                     output.Content += tagBuilder.InnerHtml;
-                    output.SelfClosing = true;
                 }
             }
         }
@@ -240,7 +239,6 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
                 // Do not generate current element's attributes or tags. Instead put both <input type="checkbox"/> and
                 // <input type="hidden"/> into the output's Content.
                 output.Attributes.Clear();
-                output.SelfClosing = false; // Otherwise Content will be ignored.
                 output.TagName = null;
 
                 output.Content += tagBuilder.ToString(TagRenderMode.SelfClosing);
diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/SelectTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/SelectTagHelper.cs
index 790b00c42f..a67b90706e 100644
--- a/src/Microsoft.AspNet.Mvc.TagHelpers/SelectTagHelper.cs
+++ b/src/Microsoft.AspNet.Mvc.TagHelpers/SelectTagHelper.cs
@@ -108,7 +108,6 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
                 {
                     output.MergeAttributes(tagBuilder);
                     output.PostContent += tagBuilder.InnerHtml;
-                    output.SelfClosing = false;
                 }
 
                 // Whether or not (not being highly unlikely) we generate anything, could update contained <option/>
diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs
index c7da6f8dce..8569b4019f 100644
--- a/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs
+++ b/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs
@@ -49,7 +49,6 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
                     output.Content = tagBuilder.InnerHtml;
 
                     output.MergeAttributes(tagBuilder);
-                    output.SelfClosing = false;
                 }
             }
         }
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.CreateWarehouse.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.CreateWarehouse.html
index 50de9402fd..c664ba3c4b 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.CreateWarehouse.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.CreateWarehouse.html
@@ -18,6 +18,6 @@
         </div>
         <div class="warehouse validation-summary-valid" data-valmsg-summary="true"><ul><li style="display:none"></li>
 </ul></div>
-        <input type="submit"></input>
+        <input type="submit" />
 </form></body>
 </html>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.EditWarehouse.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.EditWarehouse.html
index 6c17df4b6c..32f8f62d76 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.EditWarehouse.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.EditWarehouse.html
@@ -41,7 +41,7 @@ Address_1</textarea>;
         <input data-val="true" data-val-range="The field Number must be between 1 and 100." data-val-range-max="100" data-val-range-min="1" id="Employee_Number" name="Employee.Number" type="hidden" value="1" />
         <div class="validation-summary-valid" data-valmsg-summary="true"><ul><li style="display:none"></li>
 </ul></div>
-        <input type="submit"></input>
+        <input type="submit" />
     </form>
 </body>
 </html>
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Link.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Link.html
index d06c5a376c..9c4e58721b 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Link.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Link.html
@@ -6,7 +6,7 @@
     <title>Link</title>
 
     <!-- Plain link tag -->
-    <link href="/site.css" rel="stylesheet"></link>
+    <link href="/site.css" rel="stylesheet" />
 
     <!-- Globbed link tag with existing file -->
     <link rel="stylesheet" href="/site.css" />
@@ -15,10 +15,10 @@
     <link rel="stylesheet" href="/site.css" /><link rel="stylesheet" href="/sub/site2.css" />
 
     <!-- Globbed link tag missing include -->
-    <link rel="stylesheet"></link>
+    <link rel="stylesheet" />
 
     <!-- Globbed link tag missing include but with static href -->
-    <link href="/site.css" rel="stylesheet"></link>
+    <link href="/site.css" rel="stylesheet" />
 
     <!-- Globbed link tag with missing file -->
     
@@ -66,13 +66,13 @@
     <link href="/site.min.css" rel="stylesheet" data-extra="test" />
 
     <!-- Fallback with missing attribute -->
-    <link href="/site.min.css" rel="stylesheet" data-extra="test"></link>
+    <link href="/site.min.css" rel="stylesheet" data-extra="test" />
 
     <!-- Fallback with missing attribute -->
-    <link href="/site.min.css" rel="stylesheet" data-extra="test"></link>
+    <link href="/site.min.css" rel="stylesheet" data-extra="test" />
 
     <!-- Fallback with missing attribute -->
-    <link href="/site.min.css" rel="stylesheet" data-extra="test"></link>
+    <link href="/site.min.css" rel="stylesheet" data-extra="test" />
 </head>
 <body>
 
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Order.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Order.html
index 6f80cb84a0..7871b4857d 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Order.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Order.html
@@ -79,7 +79,7 @@
         <div class="order validation-summary-valid" data-valmsg-summary="true"><ul><li style="display:none"></li>
 </ul></div>
         <input type="hidden" id="Customer_Key" name="Customer.Key" value="KeyA" />
-        <input type="submit"></input>
+        <input type="submit" />
     <input name="__RequestVerificationToken" type="hidden" value="{0}" /></form>
 </body>
 </html>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Product.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Product.html
index 7bffe7572d..82cbb7839d 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Product.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Product.html
@@ -17,7 +17,7 @@
             <textarea rows="4" cols="50" class="product" id="Description" name="Description">
 Type the product description</textarea>
         </div>
-        <input type="submit"></input>
+        <input type="submit" />
     </form>
 </body>
 </html>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.ProductList.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.ProductList.html
index 7d97032b7e..ed470dd2f7 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.ProductList.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.ProductList.html
@@ -55,6 +55,6 @@
     <label class="product" for="z2__Description">Description</label>
     <textarea rows="4" cols="50" class="product" id="z2__Description" name="[2].Description">
 Product_2 description</textarea>
-</div>        <input type="submit"></input>
+</div>        <input type="submit" />
 </form></body>
 </html>
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Employee.Create.Invalid.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Employee.Create.Invalid.html
index ad08955122..b39d18a007 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Employee.Create.Invalid.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Employee.Create.Invalid.html
@@ -69,7 +69,7 @@
 
             <div class="form-group">
                 <div class="col-md-offset-2 col-md-10">
-                    <input class="btn btn-default" type="submit" value="Create"></input>
+                    <input class="btn btn-default" type="submit" value="Create" />
                 </div>
             </div>
         </div>
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Employee.Create.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Employee.Create.html
index c38c8c2075..f68288557e 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Employee.Create.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Employee.Create.html
@@ -67,7 +67,7 @@
 
             <div class="form-group">
                 <div class="col-md-offset-2 col-md-10">
-                    <input class="btn btn-default" type="submit" value="Create"></input>
+                    <input class="btn btn-default" type="submit" value="Create" />
                 </div>
             </div>
         </div>
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Home.About.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Home.About.html
index 0e319e19bc..4c22976c3b 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Home.About.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Home.About.html
@@ -3,8 +3,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8"></meta>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"></meta>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>About - My ASP.NET Application</title>
 
     
@@ -45,7 +45,7 @@
 <p><strong>Number of tags to show:</strong> 30</p>
 </section>
 </div>
-        <hr></hr>
+        <hr />
         <footer>
             
         </footer>
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Home.Help.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Home.Help.html
index f4ef7b21d0..9fd615531d 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Home.Help.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Home.Help.html
@@ -3,8 +3,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8"></meta>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"></meta>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Help - My ASP.NET Application</title>
 
     
@@ -37,7 +37,7 @@
 <div>
     <p>Hello, you've reached the help page. If you're having troubles try visiting our <a href="/?approved=true">My Approved Home Page</a></p>
 </div>
-        <hr></hr>
+        <hr />
         <footer>
             
         </footer>
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Home.Index.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Home.Index.html
index 180d61bac5..827b5b2ca1 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Home.Index.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Home.Index.html
@@ -3,8 +3,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8"></meta>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"></meta>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Home Page - My ASP.NET Application</title>
 
     
@@ -55,7 +55,7 @@
 </div>
 
 
-        <hr></hr>
+        <hr />
         <footer>
             
     
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/Runtime/ModelExpressionTagHelper.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/Runtime/ModelExpressionTagHelper.cs
index afcd4e3d8a..5c911db4de 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/Runtime/ModelExpressionTagHelper.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/Runtime/ModelExpressionTagHelper.cs
@@ -45,7 +45,7 @@ namespace Asp
             BeginContext(120, 2, true);
             WriteLiteral("\r\n");
             EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", true, "test", async() => {
             }
             , StartWritingScope, EndWritingScope);
             __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = CreateTagHelper<Microsoft.AspNet.Mvc.Razor.InputTestTagHelper>();
@@ -77,7 +77,7 @@ __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper.For = CreateModelExpression(__mo
             BeginContext(146, 2, true);
             WriteLiteral("\r\n");
             EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", true, "test", async() => {
             }
             , StartWritingScope, EndWritingScope);
             __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = CreateTagHelper<Microsoft.AspNet.Mvc.Razor.InputTestTagHelper>();
diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/FormTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/FormTagHelperTest.cs
index 6004a4c440..61fdba839d 100644
--- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/FormTagHelperTest.cs
+++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/FormTagHelperTest.cs
@@ -123,6 +123,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
 
             // Assert
             Assert.Equal("form", output.TagName);
+            Assert.False(output.SelfClosing);
             Assert.Empty(output.Attributes);
             Assert.Empty(output.PreContent);
             Assert.Empty(output.Content);
@@ -185,6 +186,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
             await formTagHelper.ProcessAsync(context, output);
 
             Assert.Equal("form", output.TagName);
+            Assert.False(output.SelfClosing);
             var attribute = Assert.Single(output.Attributes);
             Assert.Equal(expectedAttribute, attribute);
             Assert.Empty(output.PreContent);
@@ -225,6 +227,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
             generator.Verify();
 
             Assert.Equal("form", output.TagName);
+            Assert.False(output.SelfClosing);
             Assert.Empty(output.Attributes);
             Assert.Empty(output.PreContent);
             Assert.Empty(output.Content);
@@ -308,6 +311,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
 
             // Assert
             Assert.Equal("form", output.TagName);
+            Assert.False(output.SelfClosing);
             var attribute = Assert.Single(output.Attributes);
             Assert.Equal(new KeyValuePair<string, string>("aCTiON", "my-action"), attribute);
             Assert.Empty(output.PreContent);
diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/InputTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/InputTagHelperTest.cs
index adf43c2d35..0bcfb411a4 100644
--- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/InputTagHelperTest.cs
+++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/InputTagHelperTest.cs
@@ -134,7 +134,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
             Assert.Equal(expectedPreContent, output.PreContent);
             Assert.Equal(expectedContent, output.Content);
             Assert.Equal(expectedPostContent, output.PostContent);
-            Assert.True(output.SelfClosing);
+            Assert.False(output.SelfClosing);
             Assert.Equal(expectedTagName, output.TagName);
         }
 
@@ -199,7 +199,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
             Assert.Equal(expectedPreContent, output.PreContent);
             Assert.Equal(expectedContent, output.Content);
             Assert.Equal(expectedPostContent, output.PostContent);
-            Assert.False(output.SelfClosing);
+            Assert.True(output.SelfClosing);
             Assert.Null(output.TagName);       // Cleared
         }
 
@@ -281,11 +281,11 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
             // Assert
             htmlGenerator.Verify();
 
+            Assert.False(output.SelfClosing);
             Assert.Equal(expectedAttributes, output.Attributes);
             Assert.Equal(expectedPreContent, output.PreContent);
             Assert.Equal(expectedContent, output.Content);
             Assert.Equal(expectedPostContent, output.PostContent);
-            Assert.True(output.SelfClosing);
             Assert.Equal(expectedTagName, output.TagName);
         }
 
@@ -366,11 +366,11 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
             // Assert
             htmlGenerator.Verify();
 
+            Assert.False(output.SelfClosing);
             Assert.Equal(expectedAttributes, output.Attributes);
             Assert.Equal(expectedPreContent, output.PreContent);
             Assert.Equal(expectedContent, output.Content);
             Assert.Equal(expectedPostContent, output.PostContent);
-            Assert.True(output.SelfClosing);
             Assert.Equal(expectedTagName, output.TagName);
         }
 
@@ -450,11 +450,11 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
             // Assert
             htmlGenerator.Verify();
 
+            Assert.False(output.SelfClosing);
             Assert.Equal(expectedAttributes, output.Attributes);
             Assert.Equal(expectedPreContent, output.PreContent);
             Assert.Equal(expectedContent, output.Content);
             Assert.Equal(expectedPostContent, output.PostContent);
-            Assert.True(output.SelfClosing);
             Assert.Equal(expectedTagName, output.TagName);
         }
 
@@ -548,11 +548,11 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
             // Assert
             htmlGenerator.Verify();
 
+            Assert.False(output.SelfClosing);
             Assert.Equal(expectedAttributes, output.Attributes);
             Assert.Equal(expectedPreContent, output.PreContent);
             Assert.Equal(expectedContent, output.Content);
             Assert.Equal(expectedPostContent, output.PostContent);
-            Assert.True(output.SelfClosing);
             Assert.Equal(expectedTagName, output.TagName);
         }
 
diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/SelectTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/SelectTagHelperTest.cs
index fd380a81e2..a2e61fe384 100644
--- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/SelectTagHelperTest.cs
+++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/SelectTagHelperTest.cs
@@ -225,11 +225,11 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
             await tagHelper.ProcessAsync(tagHelperContext, output);
 
             // Assert
+            Assert.True(output.SelfClosing);
             Assert.Equal(expectedAttributes, output.Attributes);
             Assert.Equal(expectedPreContent, output.PreContent);
             Assert.Equal(expectedContent, output.Content);
             Assert.Equal(expectedPostContent, output.PostContent);
-            Assert.False(output.SelfClosing);
             Assert.Equal(expectedTagName, output.TagName);
 
             Assert.NotNull(viewContext.FormContext?.FormData);
@@ -313,11 +313,11 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
             await tagHelper.ProcessAsync(tagHelperContext, output);
 
             // Assert
+            Assert.True(output.SelfClosing);
             Assert.Equal(expectedAttributes, output.Attributes);
             Assert.Equal(expectedPreContent, output.PreContent);
             Assert.Equal(expectedContent, output.Content);
             Assert.Equal(expectedPostContent, output.PostContent);
-            Assert.False(output.SelfClosing);
             Assert.Equal(expectedTagName, output.TagName);
 
             Assert.NotNull(viewContext.FormContext?.FormData);
diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TextAreaTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TextAreaTagHelperTest.cs
index 5d3ae03516..d026563165 100644
--- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TextAreaTagHelperTest.cs
+++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TextAreaTagHelperTest.cs
@@ -136,9 +136,9 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
             await tagHelper.ProcessAsync(tagHelperContext, output);
 
             // Assert
+            Assert.True(output.SelfClosing);
             Assert.Equal(expectedAttributes, output.Attributes);
             Assert.Equal(expectedContent, output.Content);
-            Assert.False(output.SelfClosing);
             Assert.Equal(expectedTagName, output.TagName);
         }
 
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/CreateWarehouse.cshtml b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/CreateWarehouse.cshtml
index a735fa51f9..fc1eb4c40f 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/CreateWarehouse.cshtml
+++ b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/CreateWarehouse.cshtml
@@ -11,16 +11,16 @@
     @using (Html.BeginForm("CreateWarehouse", "MvcTagHelper_Home"))
     {
         <div>
-            <label asp-for="City" class="warehouse" />
+            <label asp-for="City" class="warehouse"></label>
             <input asp-for="City" type="text" size="50" />
-            <span asp-validation-for="City" />
+            <span asp-validation-for="City"></span>
         </div>
         <div>
-            <label asp-for="Product" class="warehouse" />
-            <select asp-for="Product" asp-items="(IEnumerable<SelectListItem>)ViewBag.Items" />
-            <span asp-validation-for="Product" />
+            <label asp-for="Product" class="warehouse"></label>
+            <select asp-for="Product" asp-items="(IEnumerable<SelectListItem>)ViewBag.Items"></select>
+            <span asp-validation-for="Product"></span>
         </div>
-        <div asp-validation-summary="ValidationSummary.All" class="warehouse" />
+        <div asp-validation-summary="ValidationSummary.All" class="warehouse"></div>
         <input type="submit" />
     }
 </body>
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditorTemplates/Employee.cshtml b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditorTemplates/Employee.cshtml
index d028101401..d7e8dd9ab8 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditorTemplates/Employee.cshtml
+++ b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditorTemplates/Employee.cshtml
@@ -8,26 +8,26 @@
     <input asp-for="Number" type="number" class="form-control" />
 </div>
 <div>
-    <label asp-for="Name" class="employee" />
+    <label asp-for="Name" class="employee"></label>
     @Html.TextAreaFor(m => m.Name)
 </div>
 <div>
-    <label asp-for="PhoneNumber" class="employee" />
+    <label asp-for="PhoneNumber" class="employee"></label>
     <input asp-for="PhoneNumber" type="tel" />
 </div>
 <div>
     @{
         var genders = new SelectList(new string[] { "Male", "Female" });
     }
-    <label asp-for="Gender" class="employee" />
-    <select asp-for="Gender" asp-items="genders" />
+    <label asp-for="Gender" class="employee"></label>
+    <select asp-for="Gender" asp-items="genders"></select>
 </div>
 <div>
-    <label asp-for="Remote" class="employee" />
+    <label asp-for="Remote" class="employee"></label>
     @Html.CheckBoxFor(m=>m.Remote)
 </div>
 <div>
-    <label asp-for="OfficeNumber" class="employee" />
+    <label asp-for="OfficeNumber" class="employee"></label>
     @{
         var offices = new SelectList(new string[] {"1001","1002"});
     }
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Order.cshtml b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Order.cshtml
index 4fefc28565..12ae02d7fe 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Order.cshtml
+++ b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Order.cshtml
@@ -20,67 +20,67 @@
 <body>
     <form asp-controller="MvcTagHelper_Order" asp-action="Submit" asp-anti-forgery=" true">
         <div>
-            <label asp-for="Shipping" class="order" />
+            <label asp-for="Shipping" class="order"></label>
             <input asp-for="Shipping" type="text" asp-format="Your shipping method is {0}" size="50" />
         </div>
         <div>
-            <label asp-for="ShippingDateTime" class="order" />
+            <label asp-for="ShippingDateTime" class="order"></label>
             <input asp-for="ShippingDateTime" type="datetime-local" />
         </div>
         <div>
-            <label asp-for="Products" class="order" />
+            <label asp-for="Products" class="order"></label>
             @{ var @object = "multiple"; }
-            <select asp-for="@Model.Products" asp-items="@((IEnumerable<SelectListItem>)ViewBag.Items)" multiple="@(@object)" />
+            <select asp-for="@Model.Products" asp-items="@((IEnumerable<SelectListItem>)ViewBag.Items)" multiple="@(@object)"></select>
         </div>
         <div>
-            <label asp-for="SubstituteProducts" class="order" />
+            <label asp-for="SubstituteProducts" class="order"></label>
             @* Use same select list as Products. Selection when Products is non-null is not used here. *@
-            <select asp-for="SubstituteProducts" asp-items="@((IEnumerable<SelectListItem>)ViewBag.Items)" />
+            <select asp-for="SubstituteProducts" asp-items="@((IEnumerable<SelectListItem>)ViewBag.Items)"></select>
         </div>
         <div>
-            <label asp-for="OrderDate" class="order" />
+            <label asp-for="OrderDate" class="order"></label>
             <input asp-for="OrderDate" type="datetime" asp-format="{0:yyyy/MM/dd/ g}" />
         </div>
         <div>
-            <label asp-for="NeedSpecialHandle" class="order" />
+            <label asp-for="NeedSpecialHandle" class="order"></label>
             <input asp-for="NeedSpecialHandle" type="checkbox" />
         </div>
         <div>
-            <label asp-for="PaymentMethod" class="order" />
+            <label asp-for="PaymentMethod" class="order"></label>
             <select asp-for="PaymentMethod">
                 <option value="Credit">Credit</option>
                 <option value="Check">Check</option>
             </select>
         </div>
         <div>
-            <label asp-for="Customer.Number" class="order" />
+            <label asp-for="Customer.Number" class="order"></label>
             <input asp-for="Customer.Number" type="number" class="form-control" />
-            <span asp-validation-for="Customer.Number" />
+            <span asp-validation-for="Customer.Number"></span>
         </div>
         <div>
-            <label asp-for="Customer.Name" class="order" />
+            <label asp-for="Customer.Name" class="order"></label>
             <input asp-for="Customer.Name" type="text" />
         </div>
         <div>
-            <label asp-for="Customer.Email" class="order" />
+            <label asp-for="Customer.Email" class="order"></label>
             <input asp-for="Customer.Email" type="email" />
-            <span asp-validation-for="Customer.Email" />
+            <span asp-validation-for="Customer.Email"></span>
         </div>
         <div>
-            <label asp-for="Customer.PhoneNumber" class="order" />
+            <label asp-for="Customer.PhoneNumber" class="order"></label>
             <input asp-for="Customer.PhoneNumber" type="tel" />
         </div>
         <div>
-            <label asp-for="Customer.Password" class="order" />
+            <label asp-for="Customer.Password" class="order"></label>
             <input asp-for="Customer.Password" type="password" class="form-control" />
-            <span asp-validation-for="Customer.Password" />
+            <span asp-validation-for="Customer.Password"></span>
         </div>
         <div>
-            <label asp-for="Customer.Gender" class="order" />
+            <label asp-for="Customer.Gender" class="order"></label>
             @Html.EditorFor(model => model.Customer.Gender)
-            <span asp-validation-for="Customer.Gender" />
+            <span asp-validation-for="Customer.Gender"></span>
         </div>
-        <div asp-validation-summary="ValidationSummary.All" class="order" />
+        <div asp-validation-summary="ValidationSummary.All" class="order"></div>
         <input type="hidden" asp-for="Customer.Key" />
         <input type="submit" />
     </form>
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Product.cshtml b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Product.cshtml
index bc2795970e..f9da8c5fe0 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Product.cshtml
+++ b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Product.cshtml
@@ -14,12 +14,12 @@
 <body>
     <form asp-controller="MvcTagHelper_Home" asp-route-action="ProductSubmit" asp-anti-forgery="false" method="get">
         <div>
-            <label asp-for="HomePage" class="product" />
+            <label asp-for="HomePage" class="product"></label>
             <input asp-for="HomePage" type="url" size="50" />
         </div>
         <div>
-            <label asp-for="Description" class="product" />
-            <textarea asp-for="Description" rows="4" cols="50" class="product" />
+            <label asp-for="Description" class="product"></label>
+            <textarea asp-for="Description" rows="4" cols="50" class="product"></textarea>
         </div>
         <input type="submit" />
     </form>
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/ProductList.cshtml b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/ProductList.cshtml
index 817a848201..501dfc5a83 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/ProductList.cshtml
+++ b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/ProductList.cshtml
@@ -17,7 +17,7 @@
             @* Update HtmlFieldPrefix so generated for, id and name attribute values are correct. *@
             ViewData.TemplateInfo.HtmlFieldPrefix = fieldPrefix + string.Format("[{0}]", index++);
             <div>
-                <label asp-for="@(model.HomePage)" class="product" />
+                <label asp-for="@(model.HomePage)" class="product"></label>
                 <input asp-for="@(model.HomePage)" type="url" size="50" disabled="disabled" readonly="readonly" />
             </div>
             @await Html.PartialAsync("_ProductPartial", model)
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/_ProductPartial.cshtml b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/_ProductPartial.cshtml
index 8316f50c40..2c5d5224b3 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/_ProductPartial.cshtml
+++ b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/_ProductPartial.cshtml
@@ -3,14 +3,14 @@
 @addTagHelper "*, Microsoft.AspNet.Mvc.TagHelpers"
 
 <div>
-    <label asp-for="Number" class="product" />
+    <label asp-for="Number" class="product"></label>
     <input asp-for="Number" type="number"/>
 </div>
 <div>
-    <label asp-for="ProductName" class="product" />
+    <label asp-for="ProductName" class="product"></label>
     <input asp-for="ProductName" type="text"/>
 </div>
 <div>
-    <label asp-for="Description" class="product" />
-    <textarea asp-for="Description" rows="4" cols="50" class="product" />
+    <label asp-for="Description" class="product"></label>
+    <textarea asp-for="Description" rows="4" cols="50" class="product"></textarea>
 </div>
\ No newline at end of file
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/Shared/Customer.cshtml b/test/WebSites/MvcTagHelpersWebSite/Views/Shared/Customer.cshtml
index 23a6b23732..dd63da6588 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/Shared/Customer.cshtml
+++ b/test/WebSites/MvcTagHelpersWebSite/Views/Shared/Customer.cshtml
@@ -10,37 +10,37 @@
 <body>
     <form asp-route-area="Customer" asp-controller="MvcTagHelper_Customer" asp-action="Index">
         <div>
-            <label asp-for="Number" class="order" />
+            <label asp-for="Number" class="order"></label>
             <input asp-for="Number" type="number" class="form-control" />
-            <span asp-validation-for="Number" />
+            <span asp-validation-for="Number"></span>
         </div>
         <div>
-            <label asp-for="Name" class="order" />
+            <label asp-for="Name" class="order"></label>
             <input asp-for="Name" type="text" />
         </div>
         <div>
-            <label asp-for="Email" class="order" />
+            <label asp-for="Email" class="order"></label>
             <input asp-for="Email" type="email" />
-            <span asp-validation-for="Email" />
+            <span asp-validation-for="Email"></span>
         </div>
         <div>
-            <label asp-for="PhoneNumber" class="order" />
+            <label asp-for="PhoneNumber" class="order"></label>
             <input asp-for="PhoneNumber" type="tel" />
         </div>
         <div>
-            <label asp-for="Password" class="order" />
+            <label asp-for="Password" class="order"></label>
             <input asp-for="Password" type="password" class="form-control" />
-            <span asp-validation-for="Password" />
+            <span asp-validation-for="Password"></span>
         </div>
         <div>
-            <label asp-for="Gender" class="order" />
+            <label asp-for="Gender" class="order"></label>
             <input asp-for="Gender" type="radio" value="Male" /> Male
             <input asp-for="Gender" type="radio" value="Female" /> Female
-            <span asp-validation-for="Gender" />
+            <span asp-validation-for="Gender"></span>
         </div>
-        <div asp-validation-summary="ValidationSummary.All" class="order" />
-        <div asp-validation-summary="ValidationSummary.ModelOnly" class="order" />
-        <input type="submit" />
+        <div asp-validation-summary="ValidationSummary.All" class="order"></div>
+        <div asp-validation-summary="ValidationSummary.ModelOnly" class="order"></div>
+        <input type="submit"></input>
     </form>
 </body>
 </html>
\ No newline at end of file
diff --git a/test/WebSites/TagHelpersWebSite/TagHelpers/WebsiteInformationTagHelper.cs b/test/WebSites/TagHelpersWebSite/TagHelpers/WebsiteInformationTagHelper.cs
index 8647e6acac..dbc5afedf0 100644
--- a/test/WebSites/TagHelpersWebSite/TagHelpers/WebsiteInformationTagHelper.cs
+++ b/test/WebSites/TagHelpersWebSite/TagHelpers/WebsiteInformationTagHelper.cs
@@ -23,6 +23,7 @@ namespace TagHelpersWebSite.TagHelpers
                 Info.CopyrightYear.ToString(),
                 Info.Approved.ToString(),
                 Info.TagsToShow.ToString());
+            output.SelfClosing = false;
         }
     }
 }
\ No newline at end of file
diff --git a/test/WebSites/TagHelpersWebSite/Views/Employee/Create.cshtml b/test/WebSites/TagHelpersWebSite/Views/Employee/Create.cshtml
index 572e65131f..908c1e5261 100644
--- a/test/WebSites/TagHelpersWebSite/Views/Employee/Create.cshtml
+++ b/test/WebSites/TagHelpersWebSite/Views/Employee/Create.cshtml
@@ -25,47 +25,47 @@
             <div asp-validation-summary="ValidationSummary.All" class="text-danger">
             </div>
             <div class="form-group">
-                <label asp-for="Age" class="control-label col-md-2" />
+                <label asp-for="Age" class="control-label col-md-2"></label>
                 <div class="col-md-10">
                     <input asp-for="Age" class="form-control" />
-                    <span asp-validation-for="Age" />
+                    <span asp-validation-for="Age"></span>
                 </div>
             </div>
             <div class="form-group">
-                <label asp-for="Email" class="control-label col-md-2" />
+                <label asp-for="Email" class="control-label col-md-2"></label>
                 <div class="col-md-10">
                     <input asp-for="Email" class="form-control" />
-                    <span asp-validation-for="Email" />
+                    <span asp-validation-for="Email"></span>
                 </div>
             </div>
             <input type="hidden" asp-for="EmployeeId" value="0" />
             <div class="form-group">
-                <label asp-for="FullName" class="control-label col-md-2" />
+                <label asp-for="FullName" class="control-label col-md-2"></label>
                 <div class="col-md-10">
                     <input asp-for="FullName" class="form-control" />
-                    <span asp-validation-for="FullName" />
+                    <span asp-validation-for="FullName"></span>
                 </div>
             </div>
             <div class="form-group">
-                <label asp-for="Gender" class="control-label col-md-2" />
+                <label asp-for="Gender" class="control-label col-md-2"></label>
                 <div class="col-md-10">
                     <input type="radio" asp-for="Gender" value="M" /> Male
                     <input type="radio" asp-for="Gender" value="F" /> Female
-                    <span asp-validation-for="Gender" />
+                    <span asp-validation-for="Gender"></span>
                 </div>
             </div>
             <div class="form-group">
-                <label asp-for="JoinDate" class="control-label col-md-2" />
+                <label asp-for="JoinDate" class="control-label col-md-2"></label>
                 <div class="col-md-10">
                     <input asp-for="JoinDate" class="form-control" />
-                    <span asp-validation-for="JoinDate" />
+                    <span asp-validation-for="JoinDate"></span>
                 </div>
             </div>
             <div class="form-group">
-                <label asp-for="Salary" class="control-label col-md-2" />
+                <label asp-for="Salary" class="control-label col-md-2"></label>
                 <div class="col-md-10">
                     <input asp-for="Salary" class="form-control" />
-                    <span asp-validation-for="Salary" />
+                    <span asp-validation-for="Salary"></span>
                 </div>
             </div>
 
diff --git a/test/WebSites/TagHelpersWebSite/Views/Home/About.cshtml b/test/WebSites/TagHelpersWebSite/Views/Home/About.cshtml
index a73f42e8fd..a98f5e6e52 100644
--- a/test/WebSites/TagHelpersWebSite/Views/Home/About.cshtml
+++ b/test/WebSites/TagHelpersWebSite/Views/Home/About.cshtml
@@ -15,5 +15,5 @@
                                     Version = new Version(1, 1),
                                     CopyrightYear = 1990,
                                     Approved = true,
-                                    TagsToShow = 30 }" />
+                                    TagsToShow = 30 }"/>
 </div>
\ No newline at end of file
diff --git a/test/WebSites/TagHelpersWebSite/Views/Home/NestedViewStartTagHelper.cshtml b/test/WebSites/TagHelpersWebSite/Views/Home/NestedViewStartTagHelper.cshtml
index dd0b4f2c1b..4cd66079c4 100644
--- a/test/WebSites/TagHelpersWebSite/Views/Home/NestedViewStartTagHelper.cshtml
+++ b/test/WebSites/TagHelpersWebSite/Views/Home/NestedViewStartTagHelper.cshtml
@@ -1,7 +1,7 @@
 @{
     Layout = null;
 }
-<root />
+<root></root>
 
 
 <nested>some-content</nested>
diff --git a/test/WebSites/TagHelpersWebSite/Views/Shared/_LayoutWithRootTagHelper.cshtml b/test/WebSites/TagHelpersWebSite/Views/Shared/_LayoutWithRootTagHelper.cshtml
index 5d3acee440..33557a59fe 100644
--- a/test/WebSites/TagHelpersWebSite/Views/Shared/_LayoutWithRootTagHelper.cshtml
+++ b/test/WebSites/TagHelpersWebSite/Views/Shared/_LayoutWithRootTagHelper.cshtml
@@ -1,2 +1,2 @@
-layout:<root/>
+layout:<root></root>
 @RenderBody()
\ No newline at end of file