diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewEngineTests.cs b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewEngineTests.cs
index af66f1ce37..d8c8ac6328 100644
--- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewEngineTests.cs
+++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewEngineTests.cs
@@ -253,6 +253,7 @@ ViewWithNestedLayout-Content
             var expected =
 @"<embdedded-layout>Hello from EmbeddedShared/_Partial
 Hello from Shared/_EmbeddedPartial
+<a href=""/EmbeddedViews"">Tag Helper Link</a>
 </embdedded-layout>";
 
             // Act
diff --git a/test/WebSites/RazorWebSite/EmbeddedViews/Views/EmbeddedHome/Index.cshtml b/test/WebSites/RazorWebSite/EmbeddedViews/Views/EmbeddedHome/Index.cshtml
index b06c70fd55..4b7d8ae335 100644
--- a/test/WebSites/RazorWebSite/EmbeddedViews/Views/EmbeddedHome/Index.cshtml
+++ b/test/WebSites/RazorWebSite/EmbeddedViews/Views/EmbeddedHome/Index.cshtml
@@ -1,3 +1,3 @@
-@{ Layout = "/Views/EmbeddedShared/_Layout.cshtml"; }
-@Html.Partial("../EmbeddedShared/_Partial.cshtml")
+@Html.Partial("../EmbeddedShared/_Partial.cshtml")
 @Html.Partial("_EmbeddedPartial")
+<a asp-controller="EmbeddedViews" asp-action="Index">Tag Helper Link</a>
diff --git a/test/WebSites/RazorWebSite/EmbeddedViews/Views/EmbeddedHome/_ViewImports.cshtml b/test/WebSites/RazorWebSite/EmbeddedViews/Views/EmbeddedHome/_ViewImports.cshtml
new file mode 100644
index 0000000000..9018c7897f
--- /dev/null
+++ b/test/WebSites/RazorWebSite/EmbeddedViews/Views/EmbeddedHome/_ViewImports.cshtml
@@ -0,0 +1 @@
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
\ No newline at end of file
diff --git a/test/WebSites/RazorWebSite/EmbeddedViews/Views/EmbeddedHome/_ViewStart.cshtml b/test/WebSites/RazorWebSite/EmbeddedViews/Views/EmbeddedHome/_ViewStart.cshtml
new file mode 100644
index 0000000000..e4209d9008
--- /dev/null
+++ b/test/WebSites/RazorWebSite/EmbeddedViews/Views/EmbeddedHome/_ViewStart.cshtml
@@ -0,0 +1 @@
+@{ Layout = "/Views/EmbeddedShared/_Layout.cshtml"; }