diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs
index 26ebf63d63..cc989d9c9a 100644
--- a/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs
+++ b/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs
@@ -32,6 +32,8 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
     [TargetElement("link", Attributes = FileVersionAttributeName)]
     public class LinkTagHelper : TagHelper
     {
+        private static readonly string Namespace = typeof(LinkTagHelper).Namespace;
+
         private const string HrefIncludeAttributeName = "asp-href-include";
         private const string HrefExcludeAttributeName = "asp-href-exclude";
         private const string FallbackHrefAttributeName = "asp-fallback-href";
@@ -40,7 +42,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
         private const string FallbackTestClassAttributeName = "asp-fallback-test-class";
         private const string FallbackTestPropertyAttributeName = "asp-fallback-test-property";
         private const string FallbackTestValueAttributeName = "asp-fallback-test-value";
-        private const string FallbackJavaScriptResourceName = "compiler/resources/LinkTagHelper_FallbackJavaScript.js";
+        private readonly string FallbackJavaScriptResourceName = Namespace + ".compiler.resources.LinkTagHelper_FallbackJavaScript.js";
         private const string FileVersionAttributeName = "asp-file-version";
         private const string HrefAttributeName = "href";
 
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/ResourceHelpers.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/ResourceHelpers.cs
index b7b52ffd6b..1f65776276 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/ResourceHelpers.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/ResourceHelpers.cs
@@ -14,6 +14,8 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
     {
         public static async Task<string> ReadResourceAsStringAsync(this Assembly assembly, string resourceName)
         {
+            resourceName = assembly.GetName().Name + "." + resourceName.Replace('/', '.');
+
             using (var resourceStream = assembly.GetManifestResourceStream(resourceName))
             {
                 using (var streamReader = new StreamReader(resourceStream))
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs
index 7cde79870f..166d49ecd4 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs
@@ -294,6 +294,8 @@ namespace Microsoft.AspNet.Mvc.Razor
 
         private static Stream GetResourceStream(string resourceName)
         {
+            resourceName = "Microsoft.AspNet.Mvc.Razor.Host.Test." + resourceName.Replace('/', '.');
+
             var assembly = typeof(MvcRazorHostTest).Assembly;
             return assembly.GetManifestResourceStream(resourceName);
         }
diff --git a/test/WebSites/FilesWebSite/Controllers/EmbeddedFilesController.cs b/test/WebSites/FilesWebSite/Controllers/EmbeddedFilesController.cs
index 1b1f639440..45b440b39a 100644
--- a/test/WebSites/FilesWebSite/Controllers/EmbeddedFilesController.cs
+++ b/test/WebSites/FilesWebSite/Controllers/EmbeddedFilesController.cs
@@ -13,7 +13,7 @@ namespace FilesWebSite
         {
             return new FilePathResult("/Greetings.txt", "text/plain")
             {
-                FileProvider = new EmbeddedFileProvider(GetType().GetTypeInfo().Assembly, "EmbeddedResources"),
+                FileProvider = new EmbeddedFileProvider(GetType().GetTypeInfo().Assembly, "FilesWebSite.EmbeddedResources"),
                 FileDownloadName = "downloadName.txt"
             };
         }
diff --git a/test/WebSites/RazorEmbeddedViewsWebSite/Startup.cs b/test/WebSites/RazorEmbeddedViewsWebSite/Startup.cs
index 6ddbe241bd..71133e3993 100644
--- a/test/WebSites/RazorEmbeddedViewsWebSite/Startup.cs
+++ b/test/WebSites/RazorEmbeddedViewsWebSite/Startup.cs
@@ -19,7 +19,7 @@ namespace RazorEmbeddedViewsWebSite
 
             services.Configure<RazorViewEngineOptions>(options =>
             {
-                options.FileProvider = new EmbeddedFileProvider(GetType().GetTypeInfo().Assembly, "EmbeddedResources");
+                options.FileProvider = new EmbeddedFileProvider(GetType().GetTypeInfo().Assembly, "RazorEmbeddedViewsWebSite.EmbeddedResources");
             });
         }