diff --git a/Directory.Build.props b/Directory.Build.props
index cd2f7311ef..346da14be8 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -102,7 +102,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Net.Compilers.Toolset" IsImplicitlyDefined="true" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" IsImplicitlyDefined="true"  />
-    <PackageReference Include="StyleCop.Analyzers" IsImplicitlyDefined="true"  />
+    <!--TODO: Enable this once tests Stylecop issues are fixed-->
+    <!--<PackageReference Include="StyleCop.Analyzers" IsImplicitlyDefined="true"  />-->
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)shared-infrastructure\stylecop.json" />
     <!--NuGet package icon source-->
     <None Include="$(MSBuildThisFileDirectory)shared-infrastructure\branding\icons\imagesharp\sixlabors.imagesharp.128.png" Pack="true" PackagePath="\icon.png" />
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 0bddf7e696..5e3f9b0618 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -25,8 +25,11 @@
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
-  
+
   <ItemGroup>
+    <!--TODO: Delete this once tests Stylecop issues are fixed-->
+    <PackageReference Include="StyleCop.Analyzers" IsImplicitlyDefined="true"  />
+
     <InternalsVisibleTo Include="DynamicProxyGenAssembly2" PublicKey="0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7" />
     <InternalsVisibleTo Include="DynamicProxyGenAssembly2, PublicKeyToken=null" />
     <InternalsVisibleTo Include="ImageSharp.Benchmarks" />