diff --git a/.globalconfig b/.globalconfig
index f2201141f9..fec0d21edc 100644
--- a/.globalconfig
+++ b/.globalconfig
@@ -146,7 +146,7 @@ dotnet_code_quality.CA1051.api_surface = public
 # CA1052: Static holder types should be Static or NotInheritable
 # https://docs.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1052
 dotnet_diagnostic.CA1052.severity = warning
-dotnet_code_quality.CA1052.api_surface = private, internal
+dotnet_code_quality.CA1052.api_surface = all
 
 # CA1054: URI-like parameters should not be strings
 # https://docs.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1054
diff --git a/src/System.Management.Automation/engine/PSVersionInfo.cs b/src/System.Management.Automation/engine/PSVersionInfo.cs
index 54cf9e0727..39fa635e73 100644
--- a/src/System.Management.Automation/engine/PSVersionInfo.cs
+++ b/src/System.Management.Automation/engine/PSVersionInfo.cs
@@ -27,7 +27,7 @@ namespace System.Management.Automation
     /// The above statement retrieves the PowerShell edition.
     /// </para>
     /// </summary>
-    public class PSVersionInfo
+    public static class PSVersionInfo
     {
         internal const string PSVersionTableName = "PSVersionTable";
         internal const string PSRemotingProtocolVersionName = "PSRemotingProtocolVersion";
diff --git a/src/System.Management.Automation/engine/serialization.cs b/src/System.Management.Automation/engine/serialization.cs
index d801178a29..ce21d8258b 100644
--- a/src/System.Management.Automation/engine/serialization.cs
+++ b/src/System.Management.Automation/engine/serialization.cs
@@ -82,10 +82,8 @@ namespace System.Management.Automation
     /// <summary>
     /// This class provides public functionality for serializing a PSObject.
     /// </summary>
-    public class PSSerializer
+    public static class PSSerializer
     {
-        internal PSSerializer() { }
-
         /// <summary>
         /// Serializes an object into PowerShell CliXml.
         /// </summary>
diff --git a/test/powershell/engine/Basic/assets/standardtypes.csv b/test/powershell/engine/Basic/assets/standardtypes.csv
index dfae58ea32..d372000dcb 100644
--- a/test/powershell/engine/Basic/assets/standardtypes.csv
+++ b/test/powershell/engine/Basic/assets/standardtypes.csv
@@ -250,7 +250,7 @@
 "System.Management.Automation.PSScriptMethod","False","False","False","False","False","False","False","True","True","False","False","False","False","False","False","False","False","False","False","False","False","False","False","True","False","False","False","False","False","False","False","True","True","False","False","True","False","False","False","False","False","False","False","False","False","False","True"
 "System.Management.Automation.PSScriptProperty","False","False","False","False","False","False","False","True","True","False","False","False","False","False","False","False","False","False","False","False","False","False","False","True","False","False","False","False","False","False","False","True","True","False","False","True","False","False","False","False","False","False","False","False","False","False","True"
 "System.Management.Automation.PSSecurityException","False","False","False","False","False","False","False","True","True","False","False","False","False","False","False","False","False","False","False","False","False","False","False","True","False","False","False","False","False","False","False","True","True","False","False","True","False","False","False","False","False","False","False","False","False","True","True"
-"System.Management.Automation.PSSerializer","False","False","False","False","False","False","False","True","True","False","False","False","False","False","False","False","False","False","False","False","False","False","False","True","False","False","False","False","False","False","False","True","True","False","False","True","False","False","False","False","False","False","False","False","False","False","True"
+"System.Management.Automation.PSSerializer","False","False","False","False","False","False","False","True","True","False","False","False","False","False","False","False","False","False","False","True","False","True","False","True","False","False","False","False","False","False","False","True","True","False","False","True","False","False","False","False","False","False","False","False","False","False","True"
 "System.Management.Automation.PSSessionTypeOption","False","False","False","False","False","False","False","True","True","False","False","False","False","False","False","False","False","False","False","True","False","False","False","True","False","False","False","False","False","False","False","True","True","False","False","True","False","False","False","False","False","False","False","False","False","False","True"
 "System.Management.Automation.PSTraceSource","False","False","False","False","False","False","False","True","True","False","False","False","False","False","False","False","False","False","False","False","False","False","False","True","False","False","False","False","False","False","False","True","True","False","False","True","False","False","False","False","False","False","False","False","False","False","True"
 "System.Management.Automation.PSTraceSourceOptions","False","False","False","False","False","False","False","True","True","False","False","False","False","False","False","False","False","False","False","False","False","True","False","False","False","False","False","False","False","False","False","True","True","False","False","True","False","False","False","False","True","False","False","True","False","True","True"
diff --git a/test/tools/WebListener/Program.cs b/test/tools/WebListener/Program.cs
index 49f3df50bb..a4b575121d 100644
--- a/test/tools/WebListener/Program.cs
+++ b/test/tools/WebListener/Program.cs
@@ -17,7 +17,7 @@ using Microsoft.Extensions.Logging;
 
 namespace mvc
 {
-    public class Program
+    public static class Program
     {
         public static void Main(string[] args)
         {