diff --git a/src/CFamily.UnitTests/CFamily.UnitTests.csproj b/src/CFamily.UnitTests/CFamily.UnitTests.csproj
index 6e62d6b4e..4a76d260b 100644
--- a/src/CFamily.UnitTests/CFamily.UnitTests.csproj
+++ b/src/CFamily.UnitTests/CFamily.UnitTests.csproj
@@ -22,6 +22,12 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  
+  <ItemGroup>
+    <Compile Include="..\TestInfrastructure\TestParallelization.cs">
+      <Link>TestParallelization.cs</Link>
+    </Compile>
+  </ItemGroup>
 
   <!-- **************************************************************** -->
   <!-- HACK to make the C++ rule loader tests work -->
diff --git a/src/Core.UnitTests/Core.UnitTests.csproj b/src/Core.UnitTests/Core.UnitTests.csproj
index 49281ef05..8040e1a3c 100644
--- a/src/Core.UnitTests/Core.UnitTests.csproj
+++ b/src/Core.UnitTests/Core.UnitTests.csproj
@@ -19,4 +19,10 @@
     <ProjectReference Include="..\TestInfrastructure\TestInfrastructure.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\TestInfrastructure\TestParallelization.cs">
+      <Link>TestParallelization.cs</Link>
+    </Compile>
+  </ItemGroup>
+
 </Project>
diff --git a/src/Education.UnitTests/Education.UnitTests.csproj b/src/Education.UnitTests/Education.UnitTests.csproj
index 392bce239..908d0530a 100644
--- a/src/Education.UnitTests/Education.UnitTests.csproj
+++ b/src/Education.UnitTests/Education.UnitTests.csproj
@@ -37,4 +37,10 @@
     <ProjectReference Include="..\TestInfrastructure\TestInfrastructure.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\TestInfrastructure\TestParallelization.cs">
+      <Link>TestParallelization.cs</Link>
+    </Compile>
+  </ItemGroup>
+
 </Project>
diff --git a/src/Integration.TeamExplorer.UnitTests/Integration.TeamExplorer.UnitTests.csproj b/src/Integration.TeamExplorer.UnitTests/Integration.TeamExplorer.UnitTests.csproj
index 0fc8bb376..ba8893193 100644
--- a/src/Integration.TeamExplorer.UnitTests/Integration.TeamExplorer.UnitTests.csproj
+++ b/src/Integration.TeamExplorer.UnitTests/Integration.TeamExplorer.UnitTests.csproj
@@ -38,5 +38,11 @@
     <ProjectReference Include="..\Progress\Progress.csproj" />
     <ProjectReference Include="..\TestInfrastructure\TestInfrastructure.csproj" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <Compile Include="..\TestInfrastructure\TestParallelization.cs">
+      <Link>TestParallelization.cs</Link>
+    </Compile>
+  </ItemGroup>
 
 </Project>
diff --git a/src/Integration.UnitTests/Integration.UnitTests.csproj b/src/Integration.UnitTests/Integration.UnitTests.csproj
index 7db47a34a..1ee326843 100644
--- a/src/Integration.UnitTests/Integration.UnitTests.csproj
+++ b/src/Integration.UnitTests/Integration.UnitTests.csproj
@@ -35,4 +35,10 @@
     <ProjectReference Include="..\Integration\Integration.csproj" />
     <ProjectReference Include="..\TestInfrastructure\TestInfrastructure.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\TestInfrastructure\TestParallelization.cs">
+      <Link>TestParallelization.cs</Link>
+    </Compile>
+  </ItemGroup>
 </Project>
diff --git a/src/Integration.Vsix.UnitTests/Integration.Vsix.UnitTests.csproj b/src/Integration.Vsix.UnitTests/Integration.Vsix.UnitTests.csproj
index 2da37e19f..3a46dadce 100644
--- a/src/Integration.Vsix.UnitTests/Integration.Vsix.UnitTests.csproj
+++ b/src/Integration.Vsix.UnitTests/Integration.Vsix.UnitTests.csproj
@@ -39,4 +39,10 @@
     <ProjectReference Include="..\TestInfrastructure\TestInfrastructure.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\TestInfrastructure\TestParallelization.cs">
+      <Link>TestParallelization.cs</Link>
+    </Compile>
+  </ItemGroup>
+
 </Project>
diff --git a/src/Roslyn.Suppressions/Roslyn.Suppressions.UnitTests/Roslyn.Suppressions.UnitTests.csproj b/src/Roslyn.Suppressions/Roslyn.Suppressions.UnitTests/Roslyn.Suppressions.UnitTests.csproj
index aa1fd97ff..105d7349c 100644
--- a/src/Roslyn.Suppressions/Roslyn.Suppressions.UnitTests/Roslyn.Suppressions.UnitTests.csproj
+++ b/src/Roslyn.Suppressions/Roslyn.Suppressions.UnitTests/Roslyn.Suppressions.UnitTests.csproj
@@ -22,5 +22,11 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.11.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.11.0" PrivateAssets="all" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\TestInfrastructure\TestParallelization.cs">
+      <Link>TestParallelization.cs</Link>
+    </Compile>
+  </ItemGroup>
   
 </Project>
diff --git a/src/SLCore.IntegrationTests/SLCore.IntegrationTests.csproj b/src/SLCore.IntegrationTests/SLCore.IntegrationTests.csproj
index 1de5a04f6..ab5587b0b 100644
--- a/src/SLCore.IntegrationTests/SLCore.IntegrationTests.csproj
+++ b/src/SLCore.IntegrationTests/SLCore.IntegrationTests.csproj
@@ -55,4 +55,10 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\TestInfrastructure\TestParallelization.cs">
+      <Link>TestParallelization.cs</Link>
+    </Compile>
+  </ItemGroup>
+
 </Project>
diff --git a/src/SLCore.Listeners.UnitTests/SLCore.Listeners.UnitTests.csproj b/src/SLCore.Listeners.UnitTests/SLCore.Listeners.UnitTests.csproj
index ad54e4753..58725c0de 100644
--- a/src/SLCore.Listeners.UnitTests/SLCore.Listeners.UnitTests.csproj
+++ b/src/SLCore.Listeners.UnitTests/SLCore.Listeners.UnitTests.csproj
@@ -19,4 +19,10 @@
     </PackageReference>
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\TestInfrastructure\TestParallelization.cs">
+      <Link>TestParallelization.cs</Link>
+    </Compile>
+  </ItemGroup>
+
 </Project>
diff --git a/src/SLCore.UnitTests/SLCore.UnitTests.csproj b/src/SLCore.UnitTests/SLCore.UnitTests.csproj
index c0e6e3d7e..549fa37b7 100644
--- a/src/SLCore.UnitTests/SLCore.UnitTests.csproj
+++ b/src/SLCore.UnitTests/SLCore.UnitTests.csproj
@@ -13,4 +13,10 @@
     <ProjectReference Include="..\TestInfrastructure\TestInfrastructure.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\TestInfrastructure\TestParallelization.cs">
+      <Link>TestParallelization.cs</Link>
+    </Compile>
+  </ItemGroup>
+
 </Project>
diff --git a/src/SonarQube.Client.Tests/SonarQube.Client.Tests.csproj b/src/SonarQube.Client.Tests/SonarQube.Client.Tests.csproj
index ff3522c5f..b633e8221 100644
--- a/src/SonarQube.Client.Tests/SonarQube.Client.Tests.csproj
+++ b/src/SonarQube.Client.Tests/SonarQube.Client.Tests.csproj
@@ -30,4 +30,10 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\TestInfrastructure\TestParallelization.cs">
+      <Link>TestParallelization.cs</Link>
+    </Compile>
+  </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/src/SLCore.IntegrationTests/TestParallelization.cs b/src/TestInfrastructure/TestParallelization.cs
similarity index 82%
rename from src/SLCore.IntegrationTests/TestParallelization.cs
rename to src/TestInfrastructure/TestParallelization.cs
index 40f27c12f..25c9d8cd6 100644
--- a/src/SLCore.IntegrationTests/TestParallelization.cs
+++ b/src/TestInfrastructure/TestParallelization.cs
@@ -18,6 +18,4 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#if DEBUG
-    [assembly:Parallelize(Workers = 4, Scope = ExecutionScope.ClassLevel)] // method level is not safe, as SLCore instance are shared inside the test classes
-#endif
+[assembly:Parallelize(Workers = 4, Scope = ExecutionScope.ClassLevel)] // method level is not safe as multiple test classes rely on global setup (for example, SLCore integration tests)