diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index a4cb71a514..245a4e0143 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -369,7 +369,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <ItemGroup Condition="'$(EnableDefaultRazorGenerateItems)'=='true'">
       <RazorGenerate
         Include="@(Content)"
-        Exclude="@(RazorComponent)"
+        Exclude="$(_RazorComponentInclude)"
         Condition="'%(Content.Extension)'=='.cshtml'" />
     </ItemGroup>
 
@@ -406,6 +406,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <ItemGroup Condition="'$(EnableDefaultRazorComponentItems)'=='true'">
       <RazorComponent Include="@(Content)" Condition="'%(Content.Extension)'=='.razor'" />
+      <RazorComponent Include="$(_RazorComponentInclude)" />
     </ItemGroup>
   </Target>
 
diff --git a/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj b/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
index 077e7ae96b..0aca4f7bc1 100644
--- a/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
+++ b/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
@@ -2,6 +2,7 @@
   
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+    <_RazorComponentInclude>**\*.cshtml</_RazorComponentInclude>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -27,10 +28,6 @@
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
   </ItemGroup>
 
-  <ItemGroup>
-    <RazorComponent Include="**/*.cshtml" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectCapability Include="DotNetCoreRazorConfiguration" />
   </ItemGroup>
diff --git a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
index 1d3cf1b9ed..9de30c05d9 100644
--- a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
+++ b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <_RazorComponentInclude>Components\**\*.cshtml</_RazorComponentInclude>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -29,10 +30,6 @@
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
 
-  <ItemGroup>
-    <RazorComponent Include="Components/**/*.cshtml" />
-  </ItemGroup>
-
   <!-- Test Placeholder -->
 
 </Project>