diff --git a/src/Services/Basket/Basket.FunctionalTests/Base/AutoAuthorizeMiddleware.cs b/src/Services/Basket/Basket.FunctionalTests/Base/AutoAuthorizeMiddleware.cs
deleted file mode 100644
index 6343dbe68..000000000
--- a/src/Services/Basket/Basket.FunctionalTests/Base/AutoAuthorizeMiddleware.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace Basket.FunctionalTests.Base;
-
-class AutoAuthorizeMiddleware
-{
-    public const string IDENTITY_ID = "9e3163b9-1ae6-4652-9dc6-7898ab7b7a00";
-
-    private readonly RequestDelegate _next;
-
-    public AutoAuthorizeMiddleware(RequestDelegate rd)
-    {
-        _next = rd;
-    }
-
-    public async Task Invoke(HttpContext httpContext)
-    {
-        var identity = new ClaimsIdentity("cookies");
-
-        identity.AddClaim(new Claim("sub", IDENTITY_ID));
-        identity.AddClaim(new Claim("unique_name", IDENTITY_ID));
-        identity.AddClaim(new Claim(ClaimTypes.Name, IDENTITY_ID));
-
-        httpContext.User.AddIdentity(identity);
-
-        await _next.Invoke(httpContext);
-    }
-}
diff --git a/src/Services/Basket/Basket.FunctionalTests/Base/BasketTestStartup.cs b/src/Services/Basket/Basket.FunctionalTests/Base/BasketTestStartup.cs
index b19d825cd..e4e17c583 100644
--- a/src/Services/Basket/Basket.FunctionalTests/Base/BasketTestStartup.cs
+++ b/src/Services/Basket/Basket.FunctionalTests/Base/BasketTestStartup.cs
@@ -1,4 +1,4 @@
-
+using FunctionalTests.Middleware;
 
 namespace Basket.FunctionalTests.Base
 {
diff --git a/src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj b/src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj
index db0b48fdb..e66bb7e6e 100644
--- a/src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj
+++ b/src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj
@@ -29,6 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Tests\Services\Application.FunctionalTests\Application.FunctionalTests.csproj" />
     <ProjectReference Include="..\Basket.API\Basket.API.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Services/Basket/Basket.FunctionalTests/BasketScenarios.cs b/src/Services/Basket/Basket.FunctionalTests/BasketScenarios.cs
index 7032dcbe2..6348c1065 100644
--- a/src/Services/Basket/Basket.FunctionalTests/BasketScenarios.cs
+++ b/src/Services/Basket/Basket.FunctionalTests/BasketScenarios.cs
@@ -1,4 +1,6 @@
-namespace Basket.FunctionalTests;
+using FunctionalTests.Middleware;
+
+namespace Basket.FunctionalTests;
 
 public class BasketScenarios
     : BasketScenarioBase
diff --git a/src/Services/Ordering/Ordering.FunctionalTests/AutoAuthorizeMiddleware.cs b/src/Services/Ordering/Ordering.FunctionalTests/AutoAuthorizeMiddleware.cs
deleted file mode 100644
index 8062dd5d0..000000000
--- a/src/Services/Ordering/Ordering.FunctionalTests/AutoAuthorizeMiddleware.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace Ordering.FunctionalTests;
-
-class AutoAuthorizeMiddleware
-{
-    public const string IDENTITY_ID = "9e3163b9-1ae6-4652-9dc6-7898ab7b7a00";
-
-    private readonly RequestDelegate _next;
-
-    public AutoAuthorizeMiddleware(RequestDelegate rd)
-    {
-        _next = rd;
-    }
-
-    public async Task Invoke(HttpContext httpContext)
-    {
-        var identity = new ClaimsIdentity("cookies");
-
-        identity.AddClaim(new Claim("sub", IDENTITY_ID));
-        identity.AddClaim(new Claim("unique_name", IDENTITY_ID));
-        identity.AddClaim(new Claim(ClaimTypes.Name, IDENTITY_ID));
-
-        httpContext.User.AddIdentity(identity);
-
-        await _next.Invoke(httpContext);
-    }
-}
diff --git a/src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj b/src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj
index b55420205..bc22d31b7 100644
--- a/src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj
+++ b/src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj
@@ -28,6 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Tests\Services\Application.FunctionalTests\Application.FunctionalTests.csproj" />
     <ProjectReference Include="..\..\..\Web\WebMVC\WebMVC.csproj" />
     <ProjectReference Include="..\Ordering.API\Ordering.API.csproj" />
     <ProjectReference Include="..\Ordering.Domain\Ordering.Domain.csproj" />
diff --git a/src/Services/Ordering/Ordering.FunctionalTests/OrderingTestStartup.cs b/src/Services/Ordering/Ordering.FunctionalTests/OrderingTestStartup.cs
index 7367042de..efff38a59 100644
--- a/src/Services/Ordering/Ordering.FunctionalTests/OrderingTestStartup.cs
+++ b/src/Services/Ordering/Ordering.FunctionalTests/OrderingTestStartup.cs
@@ -1,4 +1,6 @@
-namespace Ordering.FunctionalTests;
+using FunctionalTests.Middleware;
+
+namespace Ordering.FunctionalTests;
 
 public class OrderingTestsStartup : Startup
 {
diff --git a/src/Tests/Services/Application.FunctionalTests/Middleware/AutoAuthorizeMiddleware.cs b/src/Tests/Services/Application.FunctionalTests/Middleware/AutoAuthorizeMiddleware.cs
index 40c3c2ad8..4d2b3fe6a 100644
--- a/src/Tests/Services/Application.FunctionalTests/Middleware/AutoAuthorizeMiddleware.cs
+++ b/src/Tests/Services/Application.FunctionalTests/Middleware/AutoAuthorizeMiddleware.cs
@@ -1,6 +1,6 @@
 namespace FunctionalTests.Middleware;
 
-class AutoAuthorizeMiddleware
+public class AutoAuthorizeMiddleware
 {
     public const string IDENTITY_ID = "9e3163b9-1ae6-4652-9dc6-7898ab7b7a00";