diff --git a/Directory.Build.props b/Directory.Build.props
index c841413a58..b54f9c7b68 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -36,6 +36,10 @@
     <Compile Include="../ClientCache.cs" Link="ClientCache.cs" />
   </ItemGroup>
 
+  <ItemGroup Condition="!$(MSBuildProjectName.EndsWith('.Tests'))">
+    <InternalsVisibleTo Include="$(MSBuildProjectName).Tests" />
+  </ItemGroup>
+
   <ItemGroup Condition="$(MSBuildProjectName.EndsWith('.Tests'))">
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" Condition="'$(TargetFramework)' != 'net7.0'" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.20" Condition="'$(TargetFramework)' == 'net6.0'" />
diff --git a/src/HealthChecks.Network/HealthChecks.Network.csproj b/src/HealthChecks.Network/HealthChecks.Network.csproj
index fae66f0d59..bf24dbd0a9 100644
--- a/src/HealthChecks.Network/HealthChecks.Network.csproj
+++ b/src/HealthChecks.Network/HealthChecks.Network.csproj
@@ -12,7 +12,6 @@
     <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.9" />
     <PackageReference Include="System.Buffers" Version="4.5.1" />
     <Compile Include="../HealthCheckResultTask.cs" />
-    <InternalsVisibleTo Include="HealthChecks.Network.Tests" />
   </ItemGroup>
 
 </Project>
diff --git a/src/HealthChecks.Publisher.ApplicationInsights/HealthChecks.Publisher.ApplicationInsights.csproj b/src/HealthChecks.Publisher.ApplicationInsights/HealthChecks.Publisher.ApplicationInsights.csproj
index fb4810dc49..6780fa6e37 100644
--- a/src/HealthChecks.Publisher.ApplicationInsights/HealthChecks.Publisher.ApplicationInsights.csproj
+++ b/src/HealthChecks.Publisher.ApplicationInsights/HealthChecks.Publisher.ApplicationInsights.csproj
@@ -12,8 +12,4 @@
     <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.9" />
   </ItemGroup>
 
-  <ItemGroup>
-    <InternalsVisibleTo Include="HealthChecks.Publisher.ApplicationInsights.Tests" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/HealthChecks.UI/HealthChecks.UI.csproj b/src/HealthChecks.UI/HealthChecks.UI.csproj
index a319b68b31..68ce63d59f 100644
--- a/src/HealthChecks.UI/HealthChecks.UI.csproj
+++ b/src/HealthChecks.UI/HealthChecks.UI.csproj
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <InternalsVisibleTo Include="HealthChecks.UI.Tests;HealthChecks.UI.Image" />
+    <InternalsVisibleTo Include="HealthChecks.UI.Image" />
   </ItemGroup>
 
   <Target Name="InstallPackages" BeforeTargets="BeforeBuild">