diff --git a/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj b/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj
index 760b03bae..29a6d5612 100644
--- a/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj
+++ b/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj
@@ -38,6 +38,7 @@
     <ProjectReference Include="..\..\src\Ocelot.Provider.Eureka\Ocelot.Provider.Eureka.csproj" />
     <ProjectReference Include="..\..\src\Ocelot.Provider.Polly\Ocelot.Provider.Polly.csproj" />
     <ProjectReference Include="..\Ocelot.ManualTest\Ocelot.ManualTest.csproj" />
+    <ProjectReference Include="..\Ocelot.Testing\Ocelot.Testing.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
diff --git a/test/Ocelot.AcceptanceTests/PollyQoSTests.cs b/test/Ocelot.AcceptanceTests/PollyQoSTests.cs
index 578680950..e243bd8f8 100644
--- a/test/Ocelot.AcceptanceTests/PollyQoSTests.cs
+++ b/test/Ocelot.AcceptanceTests/PollyQoSTests.cs
@@ -7,151 +7,152 @@ namespace Ocelot.AcceptanceTests
     public class PollyQoSTests : IDisposable
     {
         private readonly Steps _steps;
-        private readonly ServiceHandler _serviceHandler;
-
-    public PollyQoSTests()
-    {
-        _serviceHandler = new ServiceHandler();
-        _steps = new Steps();
-    }
-
-    private static FileConfiguration FileConfigurationFactory(int port, QoSOptions options, string httpMethod = nameof(HttpMethods.Get)) => new()
-    {
-        Routes = new List<FileRoute>
+        private readonly ServiceHandler _serviceHandler;
+
+        public PollyQoSTests()
         {
-            new()
+            _serviceHandler = new ServiceHandler();
+            _steps = new Steps();
+        }
+
+        private static FileConfiguration FileConfigurationFactory(int port, QoSOptions options, string httpMethod = nameof(HttpMethods.Get))
+            => new()
             {
-                DownstreamPathTemplate = "/",
-                DownstreamScheme = Uri.UriSchemeHttp,
-                DownstreamHostAndPorts = new()
+                Routes = new List<FileRoute>
                 {
-                    new("localhost", port),
+                    new()
+                    {
+                        DownstreamPathTemplate = "/",
+                        DownstreamScheme = Uri.UriSchemeHttp,
+                        DownstreamHostAndPorts = new()
+                        {
+                            new("localhost", port),
+                        },
+                        UpstreamPathTemplate = "/",
+                        UpstreamHttpMethod = new() { httpMethod },
+                        QoSOptions = new FileQoSOptions(options),
+                    },
                 },
-                UpstreamPathTemplate = "/",
-                UpstreamHttpMethod = new() { httpMethod },
-                QoSOptions = new FileQoSOptions(options),
-            },
-        },
-    };
-
-    [Fact]
-    public void Should_not_timeout()
-    {
-        var port = PortFinder.GetRandomPort();
-        var configuration = FileConfigurationFactory(port, new QoSOptions(10, 0, 1000, null), HttpMethods.Post);
-
-        this.Given(x => x.GivenThereIsAServiceRunningOn($"http://localhost:{port}", 200, string.Empty, 10))
-            .And(x => _steps.GivenThereIsAConfiguration(configuration))
-            .And(x => _steps.GivenOcelotIsRunningWithPolly())
-            .And(x => _steps.GivenThePostHasContent("postContent"))
-            .When(x => _steps.WhenIPostUrlOnTheApiGateway("/"))
-            .Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
-            .BDDfy();
-    }
-
-    [Fact]
-    public void Should_timeout()
-    {
-        var port = PortFinder.GetRandomPort();
-        var configuration = FileConfigurationFactory(port, new QoSOptions(0, 0, 10, null), HttpMethods.Post);
-
-        this.Given(x => x.GivenThereIsAServiceRunningOn($"http://localhost:{port}", 201, string.Empty, 1000))
-            .And(x => _steps.GivenThereIsAConfiguration(configuration))
-            .And(x => _steps.GivenOcelotIsRunningWithPolly())
-            .And(x => _steps.GivenThePostHasContent("postContent"))
-            .When(x => _steps.WhenIPostUrlOnTheApiGateway("/"))
-            .Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.ServiceUnavailable))
-            .BDDfy();
-    }
-
-    [Fact]
-    public void Should_open_circuit_breaker_after_two_exceptions()
-    {
-        var port = PortFinder.GetRandomPort();
-        var configuration = FileConfigurationFactory(port, new QoSOptions(2, 5000, 100000, null));
-
-        this.Given(x => x.GivenThereIsABrokenServiceRunningOn($"http://localhost:{port}"))
-            .And(x => _steps.GivenThereIsAConfiguration(configuration))
-            .And(x => _steps.GivenOcelotIsRunningWithPolly())
-            .And(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
-            .And(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
-            .And(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
-            .Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.ServiceUnavailable))
-            .BDDfy();
-    }
-
-    [Fact]
-    public void Should_open_circuit_breaker_then_close()
-    {
-        var port = PortFinder.GetRandomPort();
-        var configuration = FileConfigurationFactory(port, new QoSOptions(1, 500, 1000, null));
-
-        this.Given(x => x.GivenThereIsAPossiblyBrokenServiceRunningOn($"http://localhost:{port}", "Hello from Laura"))
-            .Given(x => _steps.GivenThereIsAConfiguration(configuration))
-            .Given(x => _steps.GivenOcelotIsRunningWithPolly())
-            .When(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
-            .Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
-            .And(x => _steps.ThenTheResponseBodyShouldBe("Hello from Laura"))
-            .Given(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
-            .Given(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.ServiceUnavailable))
-            .Given(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
-            .Given(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.ServiceUnavailable))
-            .Given(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
-            .Given(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.ServiceUnavailable))
-            .Given(x => GivenIWaitMilliseconds(3000))
-            .When(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
-            .Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
-            .And(x => _steps.ThenTheResponseBodyShouldBe("Hello from Laura"))
-            .BDDfy();
-    }
-
-    [Fact]
-    public void Open_circuit_should_not_effect_different_route()
-    {
-        var port1 = PortFinder.GetRandomPort();
-        var port2 = PortFinder.GetRandomPort();
-        var qos1 = new QoSOptions(1, 1000, 500, null);
-
-        var configuration = FileConfigurationFactory(port1, qos1);
-        var route2 = configuration.Routes[0].Clone() as FileRoute;
-        route2.DownstreamHostAndPorts[0].Port = port2;
-        route2.UpstreamPathTemplate = "/working";
-        route2.QoSOptions = new();
-        configuration.Routes.Add(route2);
-
-        this.Given(x => x.GivenThereIsAPossiblyBrokenServiceRunningOn($"http://localhost:{port1}", "Hello from Laura"))
-            .And(x => x.GivenThereIsAServiceRunningOn($"http://localhost:{port2}/", 200, "Hello from Tom", 0))
-            .And(x => _steps.GivenThereIsAConfiguration(configuration))
-            .And(x => _steps.GivenOcelotIsRunningWithPolly())
-            .And(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
-            .And(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
-            .And(x => _steps.ThenTheResponseBodyShouldBe("Hello from Laura"))
-            .And(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
-            .And(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.ServiceUnavailable))
-            .And(x => _steps.WhenIGetUrlOnTheApiGateway("/working"))
-            .And(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
-            .And(x => _steps.ThenTheResponseBodyShouldBe("Hello from Tom"))
-            .And(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
-            .And(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.ServiceUnavailable))
-            .And(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
-            .And(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.ServiceUnavailable))
-            .And(x => GivenIWaitMilliseconds(3000))
-            .When(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
-            .Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
-            .And(x => _steps.ThenTheResponseBodyShouldBe("Hello from Laura"))
-            .BDDfy();
-    }
-
-    private static void GivenIWaitMilliseconds(int ms) => Thread.Sleep(ms);
+            };
 
-    private void GivenThereIsABrokenServiceRunningOn(string url)
-    {
-        _serviceHandler.GivenThereIsAServiceRunningOn(url, async context =>
-        {
-            context.Response.StatusCode = 500;
-            await context.Response.WriteAsync("this is an exception");
-        });
-    }
+        [Fact]
+        public void Should_not_timeout()
+        {
+            var port = PortFinder.GetRandomPort();
+            var configuration = FileConfigurationFactory(port, new QoSOptions(10, 0, 1000, null), HttpMethods.Post);
+
+            this.Given(x => x.GivenThereIsAServiceRunningOn($"http://localhost:{port}", 200, string.Empty, 10))
+                .And(x => _steps.GivenThereIsAConfiguration(configuration))
+                .And(x => _steps.GivenOcelotIsRunningWithPolly())
+                .And(x => _steps.GivenThePostHasContent("postContent"))
+                .When(x => _steps.WhenIPostUrlOnTheApiGateway("/"))
+                .Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
+                .BDDfy();
+        }
+
+        [Fact]
+        public void Should_timeout()
+        {
+            var port = PortFinder.GetRandomPort();
+            var configuration = FileConfigurationFactory(port, new QoSOptions(0, 0, 10, null), HttpMethods.Post);
+
+            this.Given(x => x.GivenThereIsAServiceRunningOn($"http://localhost:{port}", 201, string.Empty, 1000))
+                .And(x => _steps.GivenThereIsAConfiguration(configuration))
+                .And(x => _steps.GivenOcelotIsRunningWithPolly())
+                .And(x => _steps.GivenThePostHasContent("postContent"))
+                .When(x => _steps.WhenIPostUrlOnTheApiGateway("/"))
+                .Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.ServiceUnavailable))
+                .BDDfy();
+        }
+
+        [Fact]
+        public void Should_open_circuit_breaker_after_two_exceptions()
+        {
+            var port = PortFinder.GetRandomPort();
+            var configuration = FileConfigurationFactory(port, new QoSOptions(2, 5000, 100000, null));
+
+            this.Given(x => x.GivenThereIsABrokenServiceRunningOn($"http://localhost:{port}"))
+                .And(x => _steps.GivenThereIsAConfiguration(configuration))
+                .And(x => _steps.GivenOcelotIsRunningWithPolly())
+                .And(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
+                .And(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
+                .And(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
+                .Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.ServiceUnavailable))
+                .BDDfy();
+        }
+
+        [Fact]
+        public void Should_open_circuit_breaker_then_close()
+        {
+            var port = PortFinder.GetRandomPort();
+            var configuration = FileConfigurationFactory(port, new QoSOptions(1, 500, 1000, null));
+
+            this.Given(x => x.GivenThereIsAPossiblyBrokenServiceRunningOn($"http://localhost:{port}", "Hello from Laura"))
+                .Given(x => _steps.GivenThereIsAConfiguration(configuration))
+                .Given(x => _steps.GivenOcelotIsRunningWithPolly())
+                .When(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
+                .Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
+                .And(x => _steps.ThenTheResponseBodyShouldBe("Hello from Laura"))
+                .Given(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
+                .Given(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.ServiceUnavailable))
+                .Given(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
+                .Given(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.ServiceUnavailable))
+                .Given(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
+                .Given(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.ServiceUnavailable))
+                .Given(x => GivenIWaitMilliseconds(3000))
+                .When(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
+                .Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
+                .And(x => _steps.ThenTheResponseBodyShouldBe("Hello from Laura"))
+                .BDDfy();
+        }
+
+        [Fact]
+        public void Open_circuit_should_not_effect_different_route()
+        {
+            var port1 = PortFinder.GetRandomPort();
+            var port2 = PortFinder.GetRandomPort();
+            var qos1 = new QoSOptions(1, 1000, 500, null);
+
+            var configuration = FileConfigurationFactory(port1, qos1);
+            var route2 = configuration.Routes[0].Clone() as FileRoute;
+            route2.DownstreamHostAndPorts[0].Port = port2;
+            route2.UpstreamPathTemplate = "/working";
+            route2.QoSOptions = new();
+            configuration.Routes.Add(route2);
+
+            this.Given(x => x.GivenThereIsAPossiblyBrokenServiceRunningOn($"http://localhost:{port1}", "Hello from Laura"))
+                .And(x => x.GivenThereIsAServiceRunningOn($"http://localhost:{port2}/", 200, "Hello from Tom", 0))
+                .And(x => _steps.GivenThereIsAConfiguration(configuration))
+                .And(x => _steps.GivenOcelotIsRunningWithPolly())
+                .And(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
+                .And(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
+                .And(x => _steps.ThenTheResponseBodyShouldBe("Hello from Laura"))
+                .And(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
+                .And(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.ServiceUnavailable))
+                .And(x => _steps.WhenIGetUrlOnTheApiGateway("/working"))
+                .And(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
+                .And(x => _steps.ThenTheResponseBodyShouldBe("Hello from Tom"))
+                .And(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
+                .And(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.ServiceUnavailable))
+                .And(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
+                .And(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.ServiceUnavailable))
+                .And(x => GivenIWaitMilliseconds(3000))
+                .When(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
+                .Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.OK))
+                .And(x => _steps.ThenTheResponseBodyShouldBe("Hello from Laura"))
+                .BDDfy();
+        }
+
+        private static void GivenIWaitMilliseconds(int ms) => Thread.Sleep(ms);
+
+        private void GivenThereIsABrokenServiceRunningOn(string url)
+        {
+            _serviceHandler.GivenThereIsAServiceRunningOn(url, async context =>
+            {
+                context.Response.StatusCode = 500;
+                await context.Response.WriteAsync("this is an exception");
+            });
+        }
 
         private void GivenThereIsAPossiblyBrokenServiceRunningOn(string url, string responseBody)
         {
@@ -167,17 +168,17 @@ private void GivenThereIsAPossiblyBrokenServiceRunningOn(string url, string resp
                 context.Response.StatusCode = 200;
                 await context.Response.WriteAsync(responseBody);
             });
-        }
-
-    private void GivenThereIsAServiceRunningOn(string url, int statusCode, string responseBody, int timeout)
-    {
-        _serviceHandler.GivenThereIsAServiceRunningOn(url, async context =>
+        }
+
+        private void GivenThereIsAServiceRunningOn(string url, int statusCode, string responseBody, int timeout)
         {
-            Thread.Sleep(timeout);
-            context.Response.StatusCode = statusCode;
-            await context.Response.WriteAsync(responseBody);
-        });
-    }
+            _serviceHandler.GivenThereIsAServiceRunningOn(url, async context =>
+            {
+                Thread.Sleep(timeout);
+                context.Response.StatusCode = statusCode;
+                await context.Response.WriteAsync(responseBody);
+            });
+        }
 
         public void Dispose()
         {
diff --git a/test/Ocelot.Testing/Ocelot.Testing.csproj b/test/Ocelot.Testing/Ocelot.Testing.csproj
index cfadb03dd..fa27745f4 100644
--- a/test/Ocelot.Testing/Ocelot.Testing.csproj
+++ b/test/Ocelot.Testing/Ocelot.Testing.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <VersionPrefix>0.0.0-dev</VersionPrefix>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>