diff --git a/src/libraries/System.Security.Cryptography/tests/CryptoConfigTests.cs b/src/libraries/System.Security.Cryptography/tests/CryptoConfigTests.cs
index 892c75cb619c4..3dc54ba99c4d4 100644
--- a/src/libraries/System.Security.Cryptography/tests/CryptoConfigTests.cs
+++ b/src/libraries/System.Security.Cryptography/tests/CryptoConfigTests.cs
@@ -34,7 +34,7 @@ public static void NamedCreateMethods_NullInput()
         // The returned types on .NET Framework can differ when the machine is in FIPS mode.
         // So check hash algorithms via a more complicated manner.
         [Theory]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/61099", TestPlatforms.Browser)]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/37669", TestPlatforms.Browser)]
         [InlineData("MD5", typeof(MD5))]
         [InlineData("http://www.w3.org/2001/04/xmldsig-more#md5", typeof(MD5))]
         [InlineData("System.Security.Cryptography.HashAlgorithm", typeof(SHA1))]
@@ -68,7 +68,7 @@ public static void NamedHashAlgorithmCreate(string identifier, Type baseType)
         }
 
         [Theory]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/61099", TestPlatforms.Browser)]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/37669", TestPlatforms.Browser)]
         [InlineData("System.Security.Cryptography.HMAC", typeof(HMACSHA1))]
         [InlineData("System.Security.Cryptography.KeyedHashAlgorithm", typeof(HMACSHA1))]
         [InlineData("System.Security.Cryptography.HMACSHA1", typeof(HMACSHA1))]
@@ -101,7 +101,7 @@ public static void NamedKeyedHashAlgorithmCreate(string identifier, Type actualT
         }
 
         [Theory]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/61099", TestPlatforms.Browser)]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/37669", TestPlatforms.Browser)]
         [InlineData("AES", typeof(Aes))]
 #pragma warning disable SYSLIB0022 // Rijndael types are obsolete
         [InlineData("Rijndael", typeof(Rijndael))]
@@ -127,7 +127,7 @@ public static void NamedSymmetricAlgorithmCreate(string identifier, Type baseTyp
         }
 
         [Theory]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/61099", TestPlatforms.Browser)]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/37669", TestPlatforms.Browser)]
         [InlineData("RSA", typeof(RSA))]
         [InlineData("System.Security.Cryptography.RSA", typeof(RSA))]
         [InlineData("ECDsa", typeof(ECDsa))]
@@ -141,7 +141,7 @@ public static void NamedAsymmetricAlgorithmCreate(string identifier, Type baseTy
         }
 
         [Theory]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/61099", TestPlatforms.Browser)]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/37669", TestPlatforms.Browser)]
         [InlineData("DSA", typeof(DSA))]
         [InlineData("System.Security.Cryptography.DSA", typeof(DSA))]
         [SkipOnPlatform(PlatformSupport.MobileAppleCrypto, "DSA is not available")]
@@ -164,7 +164,7 @@ public static void NamedAsymmetricAlgorithmCreate_DSA_NotSupported(string identi
         }
 
         [Fact]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/61099", TestPlatforms.Browser)]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/37669", TestPlatforms.Browser)]
         public static void NamedCreate_Mismatch()
         {
             Assert.Throws<InvalidCastException>(() => AsymmetricAlgorithm.Create("SHA1"));
diff --git a/src/libraries/System.Security.Cryptography/tests/HashAlgorithmTest.cs b/src/libraries/System.Security.Cryptography/tests/HashAlgorithmTest.cs
index a7a5f6f43c490..3e4337d2a812c 100644
--- a/src/libraries/System.Security.Cryptography/tests/HashAlgorithmTest.cs
+++ b/src/libraries/System.Security.Cryptography/tests/HashAlgorithmTest.cs
@@ -59,7 +59,7 @@ public async Task VerifyComputeHashAsync(int size)
         }
 
         [Fact]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/61099", TestPlatforms.Browser)]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/37669", TestPlatforms.Browser)]
         public async Task ComputeHashAsync_SupportsCancellation()
         {
             using (CancellationTokenSource cancellationSource = new CancellationTokenSource(100))