diff --git a/src/KubernetesClient.Classic/AssemblyInfo.cs b/src/KubernetesClient.Classic/AssemblyInfo.cs
deleted file mode 100644
index a70d9e832..000000000
--- a/src/KubernetesClient.Classic/AssemblyInfo.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("KubernetesClient.Tests")]
diff --git a/src/KubernetesClient.Classic/KubernetesClient.Classic.csproj b/src/KubernetesClient.Classic/KubernetesClient.Classic.csproj
index a40cd4c7b..81093c91e 100644
--- a/src/KubernetesClient.Classic/KubernetesClient.Classic.csproj
+++ b/src/KubernetesClient.Classic/KubernetesClient.Classic.csproj
@@ -15,6 +15,10 @@
     <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 
+  <ItemGroup>
+    <InternalsVisibleTo Include="KubernetesClient.Tests" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="..\KubernetesClient\Models\ContainerMetrics.cs" />
     <Compile Include="..\KubernetesClient\Extensions.cs" />
@@ -123,4 +127,4 @@
   <ItemGroup>
     <ProjectReference Include="..\LibKubernetesGenerator\generators\LibKubernetesGenerator\LibKubernetesGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/KubernetesClient.ModelConverter/AssemblyInfo.cs b/src/KubernetesClient.ModelConverter/AssemblyInfo.cs
deleted file mode 100644
index e3f8177b5..000000000
--- a/src/KubernetesClient.ModelConverter/AssemblyInfo.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("KubernetesClient")]
-[assembly: InternalsVisibleTo("KubernetesClient.Classic")]
-[assembly: InternalsVisibleTo("KubernetesClient.Basic")]
-[assembly: InternalsVisibleTo("KubernetesClient.Tests")]
diff --git a/src/KubernetesClient.ModelConverter/KubernetesClient.ModelConverter.csproj b/src/KubernetesClient.ModelConverter/KubernetesClient.ModelConverter.csproj
index 763583da5..8d6a4f539 100644
--- a/src/KubernetesClient.ModelConverter/KubernetesClient.ModelConverter.csproj
+++ b/src/KubernetesClient.ModelConverter/KubernetesClient.ModelConverter.csproj
@@ -5,11 +5,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-   <ProjectReference Include="..\LibKubernetesGenerator\generators\LibKubernetesGenerator.Automapper\LibKubernetesGenerator.Automapper.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\LibKubernetesGenerator\generators\LibKubernetesGenerator.Automapper\LibKubernetesGenerator.Automapper.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <ItemGroup>
-      <ProjectReference Include="..\KubernetesClient\KubernetesClient.csproj" />
-      <PackageReference Include="AutoMapper" />
+    <ProjectReference Include="..\KubernetesClient\KubernetesClient.csproj" />
+    <PackageReference Include="AutoMapper" />
   </ItemGroup>
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="KubernetesClient.Tests" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/KubernetesClient/AssemblyInfo.cs b/src/KubernetesClient/AssemblyInfo.cs
deleted file mode 100644
index a70d9e832..000000000
--- a/src/KubernetesClient/AssemblyInfo.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("KubernetesClient.Tests")]
diff --git a/src/KubernetesClient/KubernetesClient.csproj b/src/KubernetesClient/KubernetesClient.csproj
index cbe1e29d7..910492b2e 100644
--- a/src/KubernetesClient/KubernetesClient.csproj
+++ b/src/KubernetesClient/KubernetesClient.csproj
@@ -18,4 +18,8 @@
         <ProjectReference Include="..\LibKubernetesGenerator\generators\LibKubernetesGenerator\LibKubernetesGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     </ItemGroup>
 
+    <ItemGroup>
+        <InternalsVisibleTo Include="KubernetesClient.Tests" />
+    </ItemGroup>
+
 </Project>