diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/CertificateValidationRemoteServer.cs b/src/libraries/System.Net.Security/tests/FunctionalTests/CertificateValidationRemoteServer.cs
index 588c2d3160b8c1..7f06b26c97d866 100644
--- a/src/libraries/System.Net.Security/tests/FunctionalTests/CertificateValidationRemoteServer.cs
+++ b/src/libraries/System.Net.Security/tests/FunctionalTests/CertificateValidationRemoteServer.cs
@@ -196,6 +196,11 @@ private async Task ConnectWithRevocation_WithCallback_Core(
 
             (Stream clientStream, Stream serverStream) = TestHelper.GetConnectedStreams();
 
+            if (PlatformDetection.IsWindows && testName != null)
+            {
+                TestHelper.CleanupCertificates(testName);
+            }
+
             CertificateAuthority.BuildPrivatePki(
                 PkiOptions.EndEntityRevocationViaOcsp | PkiOptions.CrlEverywhere,
                 out RevocationResponder responder,