diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets
index 53c961556a..9267ba8614 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Configuration.targets
@@ -30,12 +30,10 @@ Copyright (c) .NET Foundation. All rights reserved.
   <!--
       Resolve MVC specific configuration depending on the presence of MVC specific Razor files.
   -->
-  <Target Name="_ResolveMvcSpecificRazorConfiguration"
+  <Target Name="_ResolveMvcAssemblyAttributes"
     DependsOnTargets="ResolveRazorGenerateInputs"
     Condition="'$(Language)' == 'C#' AND '$(AddRazorSupportForMvc)' == 'true'">
 
-    <Message Text="@(RazorGenerateWithTargetPath)" Importance="High" />
-
    <PropertyGroup Condition="'@(RazorGenerate->Count())' != '0'">
       <!--
         MVC uses a ProvideApplicationPartFactoryAttribute on the generated assembly to load compiled views from assembly. Set this to false, to prevent generating this attribute.
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets
index 6b241cab48..a32b19a4d9 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets
@@ -34,7 +34,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     </GenerateRazorTargetAssemblyInfoDependsOn>
 
     <GenerateRazorTargetAssemblyInfoDependsOn Condition="'$(_Targeting30OrNewerRazorLangVersion)' == 'true'">
-      _ResolveMvcSpecificRazorConfiguration;
+      _ResolveMvcAssemblyAttributes;
       $(GenerateRazorTargetAssemblyInfoDependsOn)
     </GenerateRazorTargetAssemblyInfoDependsOn>
   </PropertyGroup>
@@ -187,7 +187,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <!-- In 3.0 or later, we need to invoke a target to determine MVC specific configuration. -->
     <_GenerateRazorAssemblyInfoDependsOn Condition="'$(_Targeting30OrNewerRazorLangVersion)' == 'true'">
-      _ResolveMvcSpecificRazorConfiguration;
+      _ResolveMvcAssemblyAttributes;
       $(_GenerateRazorAssemblyInfoDependsOn);
     </_GenerateRazorAssemblyInfoDependsOn>
   </PropertyGroup>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
index bb12cd662c..e0bbf50b9c 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildIntegrationTest.cs
@@ -444,7 +444,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
         [Fact]
         [InitializeTestProject("SimpleMvc")]
-        public async Task Build_GeneratesHostingAttributesByDefault()
+        public async Task Build_GeneratesHostingAttributes_WhenGenerateRazorHostingAssemblyInfoIsSet()
         {
             var razorAssemblyInfo = Path.Combine(IntermediateOutputPath, "SimpleMvc.AssemblyInfo.cs");
             var result = await DotnetMSBuild("Build", "/p:GenerateRazorHostingAssemblyInfo=false");
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs
index 296db5c373..6d57b38214 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/ConfigurationMetadataIntegrationTest.cs
@@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         {
         }
 
-         [Fact]
+        [Fact]
         [InitializeTestProject("SimpleMvc")]
         public async Task Build_DoesNotAddHostingMetadata_ByDefault()
         {