diff --git a/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Authentication.cs b/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Authentication.cs
index b9f11c06e2ac..0eada261f433 100644
--- a/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Authentication.cs
+++ b/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Authentication.cs
@@ -36,7 +36,7 @@ public async Task HttpClientHandler_Authentication_Succeeds(string authenticateH
         {
             if (PlatformDetection.IsWindowsNanoServer || (IsCurlHandler && authenticateHeader.ToLowerInvariant().Contains("digest")))
             {
-                // TODO: #27113: Fix failing authentication test cases on different httpclienthandlers.
+                // TODO: #28065: Fix failing authentication test cases on different httpclienthandlers.
                 return;
             }
 
@@ -63,7 +63,7 @@ public async void HttpClientHandler_MultipleAuthenticateHeaders_WithSameAuth_Suc
         {
             if (IsWinHttpHandler)
             {
-                // TODO: #27113: Fix failing authentication test cases on different httpclienthandlers.
+                // TODO: #28065: Fix failing authentication test cases on different httpclienthandlers.
                 return;
             }
 
@@ -77,7 +77,7 @@ public async Task HttpClientHandler_MultipleAuthenticateHeaders_Succeeds(string
         {
             if (PlatformDetection.IsWindowsNanoServer || (IsCurlHandler && authenticateHeader.Contains("Digest")))
             {
-                // TODO: #27113: Fix failing authentication test cases on different httpclienthandlers.
+                // TODO: #28065: Fix failing authentication test cases on different httpclienthandlers.
                 return;
             }
 
@@ -114,7 +114,7 @@ public static IEnumerable<object[]> Authentication_TestData()
             yield return new object[] { "basic", true };
 
             // Add digest tests fail on CurlHandler.
-            // TODO: #27113: Fix failing authentication test cases on different httpclienthandlers.
+            // TODO: #28065: Fix failing authentication test cases on different httpclienthandlers.
             yield return new object[] { "Digest realm=\"testrealm\" nonce=\"testnonce\"", false };
             yield return new object[] { $"Digest realm=\"testrealm\", nonce=\"{Convert.ToBase64String(Encoding.UTF8.GetBytes($"{DateTimeOffset.UtcNow}:XMh;z+$5|`i6Hx}}\", qop=auth-int, algorithm=MD5"))}\"", true };
             yield return new object[] { "Digest realm=\"api@example.org\", qop=\"auth\", algorithm=MD5-sess, nonce=\"5TsQWLVdgBdmrQ0XsxbDODV+57QdFR34I9HAbC/RVvkK\", " +
@@ -126,8 +126,7 @@ public static IEnumerable<object[]> Authentication_TestData()
 
             if (PlatformDetection.IsNetCore)
             {
-                // These fail on full framework runs.
-                // TODO: #27113: Fix failing authentication test cases on different httpclienthandlers.
+                // TODO: #28060: Fix failing authentication test cases on Framework run.
                 yield return new object[] { "Digest realm=\"testrealm1\", nonce=\"testnonce1\" Digest realm=\"testrealm2\", nonce=\"testnonce2\"", false };
                 yield return new object[] { "Basic something, Digest something", false };
                 yield return new object[] { $"Digest realm=\"testrealm\", nonce=\"testnonce\", algorithm=MD5 " +
diff --git a/src/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs b/src/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs
index 8535ec82cbb2..5fe5ebd013f6 100644
--- a/src/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs
+++ b/src/System.Net.Http/tests/FunctionalTests/SocketsHttpHandlerTest.cs
@@ -559,7 +559,7 @@ public async void SocketsHttpHandler_Authentication_Succeeds(string authenticate
         public static IEnumerable<object[]> Authentication_SocketsHttpHandler_TestData()
         {
             // These test cases pass on SocketsHttpHandler, fail everywhere else.
-            // TODO: #27113: Fix failing authentication test cases on different httpclienthandlers.
+            // TODO: #28065: Investigate failing authentication test cases on WinHttpHandler & CurlHandler.
             yield return new object[] { "Basic realm=\"testrealm1\" basic realm=\"testrealm1\"", true };
             yield return new object[] { "Basic something digest something", true };
             yield return new object[] { "Digest ", false };