diff --git a/shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs b/shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs
index 761e7bdea3..669b15206b 100644
--- a/shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs
+++ b/shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs
@@ -4,6 +4,7 @@ using System.Net;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Internal;
 using Microsoft.AspNetCore.WebUtilities;
 using MusicStore.Mocks.Common;
@@ -54,5 +55,5 @@ namespace MusicStore.Mocks.Facebook
             throw new NotImplementedException(request.RequestUri.AbsoluteUri);
         }
     }
-} 
+}
 #endif
\ No newline at end of file
diff --git a/shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs b/shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs
index 6b91ecae5a..d2f097cefe 100644
--- a/shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs
+++ b/shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs
@@ -5,7 +5,7 @@ using System.Net.Http;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http.Internal;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.WebUtilities;
 
 namespace MusicStore.Mocks.Google
@@ -53,5 +53,5 @@ namespace MusicStore.Mocks.Google
             throw new NotImplementedException(request.RequestUri.AbsoluteUri);
         }
     }
-} 
+}
 #endif
\ No newline at end of file
diff --git a/shared/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs b/shared/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs
index be46a84117..d0adf00da2 100644
--- a/shared/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs
+++ b/shared/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs
@@ -5,7 +5,7 @@ using System.Net.Http;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http.Internal;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.WebUtilities;
 
 namespace MusicStore.Mocks.MicrosoftAccount
@@ -54,5 +54,5 @@ namespace MusicStore.Mocks.MicrosoftAccount
             throw new NotImplementedException(request.RequestUri.AbsoluteUri);
         }
     }
-} 
+}
 #endif
\ No newline at end of file
diff --git a/shared/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs b/shared/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs
index df750a5c55..e4dbbae14a 100644
--- a/shared/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs
+++ b/shared/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs
@@ -5,7 +5,7 @@ using System.Net;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http.Internal;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.WebUtilities;
 
 namespace MusicStore.Mocks.Twitter
@@ -65,5 +65,5 @@ namespace MusicStore.Mocks.Twitter
             throw new NotImplementedException(request.RequestUri.AbsoluteUri);
         }
     }
-} 
+}
 #endif
\ No newline at end of file
diff --git a/test/MusicStore.Test/CartSummaryComponentTest.cs b/test/MusicStore.Test/CartSummaryComponentTest.cs
index 30cfcf13e0..449b2414c1 100644
--- a/test/MusicStore.Test/CartSummaryComponentTest.cs
+++ b/test/MusicStore.Test/CartSummaryComponentTest.cs
@@ -2,7 +2,6 @@ using System;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Internal;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.ViewComponents;
 using Microsoft.EntityFrameworkCore;
diff --git a/test/MusicStore.Test/CheckoutControllerTest.cs b/test/MusicStore.Test/CheckoutControllerTest.cs
index d9280850c8..0a22d11a76 100644
--- a/test/MusicStore.Test/CheckoutControllerTest.cs
+++ b/test/MusicStore.Test/CheckoutControllerTest.cs
@@ -5,7 +5,6 @@ using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Internal;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/test/MusicStore.Test/ManageControllerTest.cs b/test/MusicStore.Test/ManageControllerTest.cs
index b4a3c5fbce..0c3dcbdef2 100644
--- a/test/MusicStore.Test/ManageControllerTest.cs
+++ b/test/MusicStore.Test/ManageControllerTest.cs
@@ -3,10 +3,7 @@ using System.Collections.Generic;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Http.Features.Authentication;
-using Microsoft.AspNetCore.Http.Features.Authentication.Internal;
-using Microsoft.AspNetCore.Http.Internal;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.AspNetCore.Mvc;
diff --git a/test/MusicStore.Test/ShoppingCartControllerTest.cs b/test/MusicStore.Test/ShoppingCartControllerTest.cs
index f743b0285a..699d421ef4 100644
--- a/test/MusicStore.Test/ShoppingCartControllerTest.cs
+++ b/test/MusicStore.Test/ShoppingCartControllerTest.cs
@@ -6,8 +6,6 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Antiforgery;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNetCore.Http.Features.Internal;
-using Microsoft.AspNetCore.Http.Internal;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;