diff --git a/Directory.Build.props b/Directory.Build.props
index 0afd601866..d4b9aea0c7 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -25,17 +25,18 @@
     <NoWarn>$(NoWarn);1591;IDISP013</NoWarn> <!--TODO: temporary solution-->
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
+    <PackageReadmeFile Condition="Exists('README.md')">README.md</PackageReadmeFile>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Condition="Exists('README.md')" Include="README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
   <PropertyGroup Condition="$(MSBuildProjectName.EndsWith('.Tests'))">
     <NoWarn>$(NoWarn);IDE1006</NoWarn>
     <WarningsNotAsErrors>$(WarningsNotAsErrors);IDE0053;IDE0060</WarningsNotAsErrors>
   </PropertyGroup>
 
-  <PropertyGroup Condition="!$(MSBuildProjectName.EndsWith('.Tests'))">
-    <PackageReadmeFile Condition="Exists('README.md')">README.md</PackageReadmeFile>
-  </PropertyGroup>
-
   <ItemGroup Condition="!$(MSBuildProjectName.EndsWith('.Tests'))">
     <InternalsVisibleTo Include="$(MSBuildProjectName).Tests" />
   </ItemGroup>
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 5e8f97177b..12b946ef6e 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,11 +1,6 @@
 <Project>
 
-  <PropertyGroup Condition="'$(IsPackable)' == 'true'">
-    <PackageReadmeFile Condition="Exists('$(ProjectDir)README.md')">README.md</PackageReadmeFile>
-  </PropertyGroup>
-
   <ItemGroup Condition="'$(IsPackable)' == 'true'">
-    <None Condition="Exists('$(ProjectDir)README.md')" Include="README.md" Pack="true" PackagePath="\" />
     <None Include="..\..\assets\icon.png" Pack="true" PackagePath="\" Visible="false" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <Compile Include="../ApiMarker.cs" Link="ApiMarker.cs" Visible="false" />