diff --git a/src/libraries/Common/src/System/Security/Cryptography/CngHelpers.cs b/src/libraries/Common/src/System/Security/Cryptography/CngHelpers.cs
index e13c839f6ea2bc..a74d2810708958 100644
--- a/src/libraries/Common/src/System/Security/Cryptography/CngHelpers.cs
+++ b/src/libraries/Common/src/System/Security/Cryptography/CngHelpers.cs
@@ -192,11 +192,7 @@ internal static unsafe bool ExportPkcs8KeyBlob(
 
                     Interop.NCrypt.PBE_PARAMS pbeParams = default;
                     Span<byte> salt = new Span<byte>(pbeParams.rgbSalt, Interop.NCrypt.PBE_PARAMS.RgbSaltSize);
-#if NET
                     RandomNumberGenerator.Fill(salt);
-#else
-                    CngHelpers.GetRandomBytes(salt);
-#endif
                     pbeParams.Params.cbSalt = salt.Length;
                     pbeParams.Params.iIterations = kdfCount;
 
diff --git a/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/CompositeMLDsa/CompositeMLDsaTestHelpers.cs b/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/CompositeMLDsa/CompositeMLDsaTestHelpers.cs
index 5baa26ec226062..e169c8edc66ba9 100644
--- a/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/CompositeMLDsa/CompositeMLDsaTestHelpers.cs
+++ b/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/CompositeMLDsa/CompositeMLDsaTestHelpers.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.Formats.Asn1;
+using System.Security.Cryptography.Rsa.Tests;
 using Xunit;
 using Xunit.Sdk;
 
@@ -189,7 +190,7 @@ internal static void AssertPrivateKeyEquals(CompositeMLDsaAlgorithm algorithm, R
                     RSAParameters expectedRsaParameters = RSAParametersFromRawPrivateKey(expectedTradKey);
                     RSAParameters actualRsaParameters = RSAParametersFromRawPrivateKey(actualTradKey);
 
-                    Rsa.Tests.ImportExport.AssertKeyEquals(expectedRsaParameters, actualRsaParameters);
+                    RSATestHelpers.AssertKeyEquals(expectedRsaParameters, actualRsaParameters);
                 },
                 _ => Assert.Equal(expectedTradKey, actualTradKey),
                 _ => Assert.Equal(expectedTradKey, actualTradKey));
diff --git a/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/ImportExport.cs b/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/ImportExport.cs
index 47805e24928fa9..71bd6dfc64e065 100644
--- a/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/ImportExport.cs
+++ b/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/ImportExport.cs
@@ -66,7 +66,7 @@ public static void PaddedExport()
 
             // DP is the most likely to fail, the rest just otherwise ensure that Export
             // isn't losing data.
-            AssertKeyEquals(diminishedDPParameters, exported);
+            RSATestHelpers.AssertKeyEquals(diminishedDPParameters, exported);
         }
 
         [Fact]
@@ -94,7 +94,7 @@ public static void LargeKeyImportExport()
 
                 exported = rsa.ExportParameters(true);
 
-                AssertKeyEquals(imported, exported);
+                RSATestHelpers.AssertKeyEquals(imported, exported);
             }
         }
 
@@ -119,7 +119,7 @@ public static void UnusualExponentImportExport()
 
             // Exponent is the most likely to fail, the rest just otherwise ensure that Export
             // isn't losing data.
-            AssertKeyEquals(unusualExponentParameters, exported);
+            RSATestHelpers.AssertKeyEquals(unusualExponentParameters, exported);
         }
 
         [Fact]
@@ -136,7 +136,7 @@ public static void ImportExport1032()
                 exportedPublic = rsa.ExportParameters(false);
             }
 
-            AssertKeyEquals(imported, exported);
+            RSATestHelpers.AssertKeyEquals(imported, exported);
 
             Assert.Equal(exportedPublic.Modulus, imported.Modulus);
             Assert.Equal(exportedPublic.Exponent, imported.Exponent);
@@ -169,7 +169,7 @@ public static void ImportReset()
                 Assert.Equal(imported.Modulus.Length * 8, rsa.KeySize);
 
                 exported = rsa.ExportParameters(true);
-                AssertKeyEquals(imported, exported);
+                RSATestHelpers.AssertKeyEquals(imported, exported);
             }
         }
 
@@ -207,18 +207,18 @@ public static void MultiExport()
                 RSAParameters exportedPrivate3 = rsa.ExportParameters(true);
                 RSAParameters exportedPublic3 = rsa.ExportParameters(false);
 
-                AssertKeyEquals(imported, exportedPrivate);
+                RSATestHelpers.AssertKeyEquals(imported, exportedPrivate);
 
                 Assert.Equal(imported.Modulus, exportedPublic.Modulus);
                 Assert.Equal(imported.Exponent, exportedPublic.Exponent);
                 Assert.Null(exportedPublic.D);
                 ValidateParameters(ref exportedPublic);
 
-                AssertKeyEquals(exportedPrivate, exportedPrivate2);
-                AssertKeyEquals(exportedPrivate, exportedPrivate3);
+                RSATestHelpers.AssertKeyEquals(exportedPrivate, exportedPrivate2);
+                RSATestHelpers.AssertKeyEquals(exportedPrivate, exportedPrivate3);
 
-                AssertKeyEquals(exportedPublic, exportedPublic2);
-                AssertKeyEquals(exportedPublic, exportedPublic3);
+                RSATestHelpers.AssertKeyEquals(exportedPublic, exportedPublic2);
+                RSATestHelpers.AssertKeyEquals(exportedPublic, exportedPublic3);
             }
         }
 
diff --git a/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyFileTests.cs b/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyFileTests.cs
index daa175dda47a93..6ac8f53aa78385 100644
--- a/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyFileTests.cs
+++ b/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyFileTests.cs
@@ -1454,7 +1454,7 @@ private static void ReadWriteKey(
                 arrayExport = writeArrayFunc(rsa);
 
                 RSAParameters rsaParameters = rsa.ExportParameters(isPrivateKey);
-                ImportExport.AssertKeyEquals(expected, rsaParameters);
+                RSATestHelpers.AssertKeyEquals(expected, rsaParameters);
             }
 
             // Public key formats are stable.
@@ -1478,7 +1478,7 @@ private static void ReadWriteKey(
                 Assert.Equal(arrayExport.Length, bytesRead);
 
                 RSAParameters rsaParameters = rsa.ExportParameters(isPrivateKey);
-                ImportExport.AssertKeyEquals(expected, rsaParameters);
+                RSATestHelpers.AssertKeyEquals(expected, rsaParameters);
 
                 Assert.False(
                     writeSpanFunc(rsa, Span<byte>.Empty, out int bytesWritten),
diff --git a/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyPemTests.cs b/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyPemTests.cs
index 27438e93d36e6b..1ef844ac1d0890 100644
--- a/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyPemTests.cs
+++ b/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyPemTests.cs
@@ -44,7 +44,7 @@ public static void ImportFromPem_RSAPrivateKey_Simple()
                 rsa.ImportFromPem(pem);
                 RSAParameters rsaParameters = rsa.ExportParameters(true);
 
-                ImportExport.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
+                RSATestHelpers.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
             }
         }
 
@@ -68,7 +68,7 @@ public static void ImportFromPem_Pkcs8UnEncrypted_Simple()
                 rsa.ImportFromPem(pem);
                 RSAParameters rsaParameters = rsa.ExportParameters(true);
 
-                ImportExport.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
+                RSATestHelpers.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
             }
         }
 
@@ -97,7 +97,7 @@ public static void ImportFromPem_Pkcs8UnEncrypted_UnrelatedAlgorithmIsIgnored()
                 rsa.ImportFromPem(pem);
                 RSAParameters rsaParameters = rsa.ExportParameters(true);
 
-                ImportExport.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
+                RSATestHelpers.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
             }
         }
 
@@ -114,7 +114,7 @@ public static void ImportFromPem_SubjectPublicKeyInfo_Simple()
                 rsa.ImportFromPem(pem);
                 RSAParameters rsaParameters = rsa.ExportParameters(false);
 
-                ImportExport.AssertKeyEquals(TestData.DiminishedDPParameters.ToPublic(), rsaParameters);
+                RSATestHelpers.AssertKeyEquals(TestData.DiminishedDPParameters.ToPublic(), rsaParameters);
             }
         }
 
@@ -136,7 +136,7 @@ public static void ImportFromPem_SubjectPublicKeyInfo_IgnoresUnrelatedAlgorithm(
                 rsa.ImportFromPem(pem);
                 RSAParameters rsaParameters = rsa.ExportParameters(false);
 
-                ImportExport.AssertKeyEquals(TestData.DiminishedDPParameters.ToPublic(), rsaParameters);
+                RSATestHelpers.AssertKeyEquals(TestData.DiminishedDPParameters.ToPublic(), rsaParameters);
             }
         }
 
@@ -154,7 +154,7 @@ public static void ImportFromPem_RSAPublicKey_Simple()
                 rsa.ImportFromPem(pem);
                 RSAParameters rsaParameters = rsa.ExportParameters(false);
 
-                ImportExport.AssertKeyEquals(TestData.DiminishedDPParameters.ToPublic(), rsaParameters);
+                RSATestHelpers.AssertKeyEquals(TestData.DiminishedDPParameters.ToPublic(), rsaParameters);
             }
         }
 
@@ -191,7 +191,7 @@ public static void ImportFromPem_RSAPrivateKey_PrecedingUnrelatedPem()
                 rsa.ImportFromPem(pem);
                 RSAParameters rsaParameters = rsa.ExportParameters(true);
 
-                ImportExport.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
+                RSATestHelpers.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
             }
         }
 
@@ -216,7 +216,7 @@ public static void ImportFromPem_RSAPrivateKey_PrecedingMalformedPem()
                 rsa.ImportFromPem(pem);
                 RSAParameters rsaParameters = rsa.ExportParameters(true);
 
-                ImportExport.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
+                RSATestHelpers.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
             }
         }
 
@@ -243,7 +243,7 @@ public static void ImportFromPem_RSAPrivateKey_IgnoresOtherAlgorithms()
                 rsa.ImportFromPem(pem);
                 RSAParameters rsaParameters = rsa.ExportParameters(true);
 
-                ImportExport.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
+                RSATestHelpers.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
             }
         }
 
@@ -403,7 +403,7 @@ public static void ImportFromEncryptedPem_Pkcs8Encrypted_Char_Simple()
                 rsa.ImportFromEncryptedPem(pem, (ReadOnlySpan<char>)"test");
                 RSAParameters rsaParameters = rsa.ExportParameters(true);
 
-                ImportExport.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
+                RSATestHelpers.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
             }
         }
 
@@ -428,7 +428,7 @@ public static void ImportFromEncryptedPem_Pkcs8Encrypted_Byte_Simple()
                 rsa.ImportFromEncryptedPem(pem, "test"u8);
                 RSAParameters rsaParameters = rsa.ExportParameters(true);
 
-                ImportExport.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
+                RSATestHelpers.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
             }
         }
 
diff --git a/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/ImportExport.Shared.cs b/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSATestHelpers.cs
similarity index 95%
rename from src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/ImportExport.Shared.cs
rename to src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSATestHelpers.cs
index 6f47cca124c765..23568417c5f00f 100644
--- a/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/ImportExport.Shared.cs
+++ b/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSATestHelpers.cs
@@ -6,8 +6,7 @@
 
 namespace System.Security.Cryptography.Rsa.Tests
 {
-    // TODO This is used in multiple tests files, so move this into a common Helpers class.
-    public partial class ImportExport
+    public class RSATestHelpers
     {
         internal static void AssertKeyEquals(in RSAParameters expected, in RSAParameters actual)
         {
diff --git a/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAXml.cs b/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAXml.cs
index 666f9bea3c4095..69389f2adef05d 100644
--- a/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAXml.cs
+++ b/src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAXml.cs
@@ -996,15 +996,15 @@ public static void FromToXml()
                 {
                     rsaPub.FromXmlString(xmlPub);
 
-                    ImportExport.AssertKeyEquals(pubOnly, rsaPub.ExportParameters(false));
+                    RSATestHelpers.AssertKeyEquals(pubOnly, rsaPub.ExportParameters(false));
                 }
 
                 using (RSA rsaPriv = RSAFactory.Create())
                 {
                     rsaPriv.FromXmlString(xmlPriv);
 
-                    ImportExport.AssertKeyEquals(pubPriv, rsaPriv.ExportParameters(true));
-                    ImportExport.AssertKeyEquals(pubOnly, rsaPriv.ExportParameters(false));
+                    RSATestHelpers.AssertKeyEquals(pubPriv, rsaPriv.ExportParameters(true));
+                    RSATestHelpers.AssertKeyEquals(pubOnly, rsaPriv.ExportParameters(false));
                 }
             }
         }
@@ -1274,7 +1274,7 @@ private static void TestReadXml(string xmlString, in RSAParameters expectedParam
 
                 bool includePrivateParameters = expectedParameters.D != null;
 
-                ImportExport.AssertKeyEquals(
+                RSATestHelpers.AssertKeyEquals(
                     expectedParameters,
                     rsa.ExportParameters(includePrivateParameters));
             }
diff --git a/src/libraries/Microsoft.Bcl.Cryptography/src/Microsoft.Bcl.Cryptography.csproj b/src/libraries/Microsoft.Bcl.Cryptography/src/Microsoft.Bcl.Cryptography.csproj
index c2cc1de2a16646..af50013e0e9a3f 100644
--- a/src/libraries/Microsoft.Bcl.Cryptography/src/Microsoft.Bcl.Cryptography.csproj
+++ b/src/libraries/Microsoft.Bcl.Cryptography/src/Microsoft.Bcl.Cryptography.csproj
@@ -479,7 +479,6 @@
     <Compile Include="$(CommonPath)Interop\Windows\NCrypt\Interop.SignVerify.cs"
              Link="Common\Interop\Windows\NCrypt\Interop.SignVerify.cs" />
 
-    <Compile Include="System\Security\Cryptography\CngHelpers.cs" />
     <Compile Include="System\Security\Cryptography\CngExtensions.cs" />
     <Compile Include="System\Security\Cryptography\CngIdentifierExtensions.cs" />
   </ItemGroup>
diff --git a/src/libraries/Microsoft.Bcl.Cryptography/src/System/Security/Cryptography/CngHelpers.cs b/src/libraries/Microsoft.Bcl.Cryptography/src/System/Security/Cryptography/CngHelpers.cs
deleted file mode 100644
index fd13b4cd9e77c7..00000000000000
--- a/src/libraries/Microsoft.Bcl.Cryptography/src/System/Security/Cryptography/CngHelpers.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-namespace System.Security.Cryptography
-{
-    internal static partial class CngHelpers
-    {
-        internal static unsafe void GetRandomBytes(Span<byte> buffer)
-        {
-            if (buffer.Length > 0)
-            {
-                fixed (byte* pbBuffer = buffer)
-                {
-                    Interop.BCrypt.NTSTATUS status = Interop.BCrypt.BCryptGenRandom(IntPtr.Zero, pbBuffer, buffer.Length, Interop.BCrypt.BCRYPT_USE_SYSTEM_PREFERRED_RNG);
-                    if (status != Interop.BCrypt.NTSTATUS.STATUS_SUCCESS)
-                        throw Interop.BCrypt.CreateCryptographicException(status);
-                }
-            }
-        }
-    }
-}
diff --git a/src/libraries/Microsoft.Bcl.Cryptography/tests/Microsoft.Bcl.Cryptography.Tests.csproj b/src/libraries/Microsoft.Bcl.Cryptography/tests/Microsoft.Bcl.Cryptography.Tests.csproj
index e284c3c841bbc4..27b0a847e0a548 100644
--- a/src/libraries/Microsoft.Bcl.Cryptography/tests/Microsoft.Bcl.Cryptography.Tests.csproj
+++ b/src/libraries/Microsoft.Bcl.Cryptography/tests/Microsoft.Bcl.Cryptography.Tests.csproj
@@ -192,8 +192,8 @@
              Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\MLDsa\MLDsaTestsData.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\MLDsa\MLDsaTestsData.Ietf.cs"
              Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\MLDsa\MLDsaTestsData.Ietf.cs" />
-    <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.Shared.cs"
-             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.Shared.cs" />
+    <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSATestHelpers.cs"
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSATestHelpers.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\SlhDsa\SlhDsaAlgorithmTests.cs"
              Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\SlhDsa\SlhDsaAlgorithmTests.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\SlhDsa\SlhDsaContractTests.cs"
diff --git a/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj b/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj
index 94fced2d6c75ca..ec40f0cf563f64 100644
--- a/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj
@@ -69,12 +69,12 @@
              Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs"
              Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs" />
-    <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.Shared.cs"
-             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.Shared.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\KeyGeneration.cs"
              Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\KeyGeneration.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSAFactory.cs"
              Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAFactory.cs" />
+    <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSATestHelpers.cs"
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSATestHelpers.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.cs"
              Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\TestData.cs"
diff --git a/src/libraries/System.Security.Cryptography.Csp/tests/RSAImportExportCspBlobTests.cs b/src/libraries/System.Security.Cryptography.Csp/tests/RSAImportExportCspBlobTests.cs
index b35db7a2b3cf74..a81c84af511833 100644
--- a/src/libraries/System.Security.Cryptography.Csp/tests/RSAImportExportCspBlobTests.cs
+++ b/src/libraries/System.Security.Cryptography.Csp/tests/RSAImportExportCspBlobTests.cs
@@ -108,7 +108,7 @@ public static void RSAParametersToBlob_PublicOnly()
                 Exponent = TestData.RSA1024Params.Exponent,
             };
 
-            ImportExport.AssertKeyEquals(expected, exported);
+            RSATestHelpers.AssertKeyEquals(expected, exported);
         }
 
         [Fact]
@@ -135,7 +135,7 @@ public static void RSAParametersToBlob_PublicPrivate()
 
             RSAParameters expected = TestData.RSA1024Params;
 
-            ImportExport.AssertKeyEquals(expected, exported);
+            RSATestHelpers.AssertKeyEquals(expected, exported);
         }
     }
 }
diff --git a/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj b/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj
index 6c920a6e108ace..897042d852e72b 100644
--- a/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj
@@ -28,12 +28,12 @@
              Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs"
              Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs" />
-    <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.Shared.cs"
-             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.Shared.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\KeyGeneration.cs"
              Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\KeyGeneration.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSAFactory.cs"
              Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAFactory.cs" />
+    <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSATestHelpers.cs"
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSATestHelpers.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.cs"
              Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\TestData.cs"
diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/tests/RsaOpenSslTests.cs b/src/libraries/System.Security.Cryptography.OpenSsl/tests/RsaOpenSslTests.cs
index 6dc3413eef657c..2c3498ce8716d9 100644
--- a/src/libraries/System.Security.Cryptography.OpenSsl/tests/RsaOpenSslTests.cs
+++ b/src/libraries/System.Security.Cryptography.OpenSsl/tests/RsaOpenSslTests.cs
@@ -103,7 +103,7 @@ public static void VerifyParameterCtor()
         {
             using (RSA rsa = new RSAOpenSsl(TestData.RSA1032Parameters))
             {
-                ImportExport.AssertKeyEquals(TestData.RSA1032Parameters, rsa.ExportParameters(true));
+                RSATestHelpers.AssertKeyEquals(TestData.RSA1032Parameters, rsa.ExportParameters(true));
             }
         }
     }
diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj b/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj
index 983f49ad60a4fa..15e7ea47e1cd2b 100644
--- a/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj
@@ -62,12 +62,12 @@
              Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs"
              Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs" />
-    <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.Shared.cs"
-             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.Shared.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\KeyGeneration.cs"
              Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\KeyGeneration.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSAFactory.cs"
              Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAFactory.cs" />
+    <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSATestHelpers.cs"
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSATestHelpers.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.cs"
              Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\TestData.cs"
diff --git a/src/libraries/System.Security.Cryptography/tests/RSACreateTests.cs b/src/libraries/System.Security.Cryptography/tests/RSACreateTests.cs
index 8847051e6998d9..f5fc62b87c7e5f 100644
--- a/src/libraries/System.Security.Cryptography/tests/RSACreateTests.cs
+++ b/src/libraries/System.Security.Cryptography/tests/RSACreateTests.cs
@@ -66,7 +66,7 @@ private static void CreateWithParameters(RSAParameters parameters)
                 exportedPrivate = rsa.ExportParameters(true);
             }
 
-            ImportExport.AssertKeyEquals(parameters, exportedPrivate);
+            RSATestHelpers.AssertKeyEquals(parameters, exportedPrivate);
         }
 
         [Fact]
diff --git a/src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj b/src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj
index 44ff86f081339d..f437fa1102ec0c 100644
--- a/src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj
+++ b/src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj
@@ -409,8 +409,6 @@
              Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.netcoreapp.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs"
              Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs" />
-    <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.Shared.cs"
-             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.Shared.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\KeyGeneration.cs"
              Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\KeyGeneration.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSAFactory.cs"
@@ -423,6 +421,8 @@
              Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAKeyPemTests.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSASignatureFormatter.cs"
              Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSASignatureFormatter.cs" />
+    <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSATestHelpers.cs"
+             Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSATestHelpers.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSAXml.cs"
              Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSAXml.cs" />
     <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\SignVerify.cs"
diff --git a/src/libraries/System.Security.Cryptography/tests/X509Certificates/X509Certificate2PemTests.cs b/src/libraries/System.Security.Cryptography/tests/X509Certificates/X509Certificate2PemTests.cs
index a1e35ee0df9cc0..7c247857a6d2dd 100644
--- a/src/libraries/System.Security.Cryptography/tests/X509Certificates/X509Certificate2PemTests.cs
+++ b/src/libraries/System.Security.Cryptography/tests/X509Certificates/X509Certificate2PemTests.cs
@@ -368,12 +368,12 @@ public static void CreateFromPem_MLKem_Pkcs8_Success()
                 ),
             ];
 
-            foreach((string CertificatePem, string PrivateKeyPem, string Thumbprint) in cases)
+            foreach((string certificatePem, string privateKeyPem, string thumbprint) in cases)
             {
-                using (X509Certificate2 cert = X509Certificate2.CreateFromPem(CertificatePem, PrivateKeyPem))
+                using (X509Certificate2 cert = X509Certificate2.CreateFromPem(certificatePem, privateKeyPem))
                 {
-                    Assert.Equal(Thumbprint, cert.GetCertHashString(HashAlgorithmName.SHA256));
-                    AssertKeysMatch(PrivateKeyPem, cert.GetMLKemPrivateKey);
+                    Assert.Equal(thumbprint, cert.GetCertHashString(HashAlgorithmName.SHA256));
+                    AssertKeysMatch(privateKeyPem, cert.GetMLKemPrivateKey);
                 }
             }
         }
@@ -430,15 +430,15 @@ public static void CreateFromEncryptedPem_MLKem_Pkcs8_Success()
                 ),
             ];
 
-            foreach((string CertificatePem, string PrivateKeyPem, string Thumbprint) in cases)
+            foreach((string certificatePem, string privateKeyPem, string thumbprint) in cases)
             {
                 using (X509Certificate2 cert = X509Certificate2.CreateFromEncryptedPem(
-                    CertificatePem,
-                    PrivateKeyPem,
+                    certificatePem,
+                    privateKeyPem,
                     MLKemTestData.EncryptedPrivateKeyPassword))
                 {
-                    Assert.Equal(Thumbprint, cert.GetCertHashString(HashAlgorithmName.SHA256));
-                    AssertKeysMatch(PrivateKeyPem, cert.GetMLKemPrivateKey, MLKemTestData.EncryptedPrivateKeyPassword);
+                    Assert.Equal(thumbprint, cert.GetCertHashString(HashAlgorithmName.SHA256));
+                    AssertKeysMatch(privateKeyPem, cert.GetMLKemPrivateKey, MLKemTestData.EncryptedPrivateKeyPassword);
                 }
             }
         }
@@ -495,12 +495,12 @@ public static void CreateFromPem_MLDsa_Pkcs8_Success()
                 ),
             ];
 
-            foreach ((string CertificatePem, string PrivateKeyPem, string Thumbprint) in cases)
+            foreach ((string certificatePem, string privateKeyPem, string thumbprint) in cases)
             {
-                using (X509Certificate2 cert = X509Certificate2.CreateFromPem(CertificatePem, PrivateKeyPem))
+                using (X509Certificate2 cert = X509Certificate2.CreateFromPem(certificatePem, privateKeyPem))
                 {
-                    Assert.Equal(Thumbprint, cert.GetCertHashString(HashAlgorithmName.SHA256));
-                    AssertKeysMatch(PrivateKeyPem, cert.GetMLDsaPrivateKey);
+                    Assert.Equal(thumbprint, cert.GetCertHashString(HashAlgorithmName.SHA256));
+                    AssertKeysMatch(privateKeyPem, cert.GetMLDsaPrivateKey);
                 }
             }
         }
@@ -557,15 +557,15 @@ public static void CreateFromEncryptedPem_MLDsa_Pkcs8_Success()
                 ),
             ];
 
-            foreach ((string CertificatePem, string PrivateKeyPem, string Thumbprint) in cases)
+            foreach ((string certificatePem, string privateKeyPem, string thumbprint) in cases)
             {
                 using (X509Certificate2 cert = X509Certificate2.CreateFromEncryptedPem(
-                    CertificatePem,
-                    PrivateKeyPem,
+                    certificatePem,
+                    privateKeyPem,
                     "PLACEHOLDER"))
                 {
-                    Assert.Equal(Thumbprint, cert.GetCertHashString(HashAlgorithmName.SHA256));
-                    AssertKeysMatch(PrivateKeyPem, cert.GetMLDsaPrivateKey, "PLACEHOLDER");
+                    Assert.Equal(thumbprint, cert.GetCertHashString(HashAlgorithmName.SHA256));
+                    AssertKeysMatch(privateKeyPem, cert.GetMLDsaPrivateKey, "PLACEHOLDER");
                 }
             }
         }