diff --git a/samples/OrdersApi/Consumer.Tests/Consumer.Tests.csproj b/samples/OrdersApi/Consumer.Tests/Consumer.Tests.csproj
index a88109dd..042ed50e 100644
--- a/samples/OrdersApi/Consumer.Tests/Consumer.Tests.csproj
+++ b/samples/OrdersApi/Consumer.Tests/Consumer.Tests.csproj
@@ -5,10 +5,10 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="xunit" Version="2.6.6" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/samples/OrdersApi/Provider.Tests/Provider.Tests.csproj b/samples/OrdersApi/Provider.Tests/Provider.Tests.csproj
index 1517e0f4..375e2ec6 100644
--- a/samples/OrdersApi/Provider.Tests/Provider.Tests.csproj
+++ b/samples/OrdersApi/Provider.Tests/Provider.Tests.csproj
@@ -1,13 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="xunit" Version="2.6.6" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/samples/OrdersApi/Provider.Tests/ProviderTests.cs b/samples/OrdersApi/Provider.Tests/ProviderTests.cs
index 1feb302e..2252f0e9 100644
--- a/samples/OrdersApi/Provider.Tests/ProviderTests.cs
+++ b/samples/OrdersApi/Provider.Tests/ProviderTests.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text.Json;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 using PactNet;
@@ -14,7 +15,7 @@
 
 namespace Provider.Tests
 {
-    public class ProviderTests : IDisposable
+    public class ProviderTests : IAsyncLifetime
     {
         private static readonly Uri ProviderUri = new("http://localhost:5000");
 
@@ -36,8 +37,6 @@ public ProviderTests(ITestOutputHelper output)
                                   webBuilder.UseStartup<TestStartup>();
                               })
                               .Build();
-
-            this.server.Start();
             
             this.verifier = new PactVerifier("Orders API", new PactVerifierConfig
             {
@@ -49,10 +48,19 @@ public ProviderTests(ITestOutputHelper output)
             });
         }
 
-        public void Dispose()
+        /// <summary>
+        /// Called immediately after the class has been created, before it is used.
+        /// </summary>
+        public Task InitializeAsync()
+        {
+            this.server.Start();
+            return Task.CompletedTask;
+        }
+
+        public async Task DisposeAsync()
         {
+            await this.verifier.DisposeAsync();
             this.server.Dispose();
-            this.verifier.Dispose();
         }
 
         [Fact]
diff --git a/src/PactNet.Abstractions/PactNet.Abstractions.csproj b/src/PactNet.Abstractions/PactNet.Abstractions.csproj
index c3a5209c..d64c7f4f 100644
--- a/src/PactNet.Abstractions/PactNet.Abstractions.csproj
+++ b/src/PactNet.Abstractions/PactNet.Abstractions.csproj
@@ -12,6 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
diff --git a/src/PactNet.Abstractions/Verifier/Messaging/IMessageScenarios.cs b/src/PactNet.Abstractions/Verifier/Messaging/IMessageScenarios.cs
index 58b728a6..4fc88676 100644
--- a/src/PactNet.Abstractions/Verifier/Messaging/IMessageScenarios.cs
+++ b/src/PactNet.Abstractions/Verifier/Messaging/IMessageScenarios.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace PactNet.Verifier.Messaging
 {
@@ -20,6 +21,13 @@ public interface IMessageScenarios
         /// <param name="factory">Message content factory</param>
         IMessageScenarios Add(string description, Func<dynamic> factory);
 
+        /// <summary>
+        /// Add a message scenario
+        /// </summary>
+        /// <param name="description">Scenario description</param>
+        /// <param name="factory">Message content factory</param>
+        IMessageScenarios Add(string description, Func<Task<dynamic>> factory);
+
         /// <summary>
         /// Add a message scenario by configuring a scenario builder
         /// </summary>
diff --git a/src/PactNet.Abstractions/Verifier/Messaging/IMessagingProvider.cs b/src/PactNet.Abstractions/Verifier/Messaging/IMessagingProvider.cs
index 5aa61d00..8d9955b5 100644
--- a/src/PactNet.Abstractions/Verifier/Messaging/IMessagingProvider.cs
+++ b/src/PactNet.Abstractions/Verifier/Messaging/IMessagingProvider.cs
@@ -6,7 +6,7 @@ namespace PactNet.Verifier.Messaging
     /// <summary>
     /// Messaging provider service, which simulates messaging responses in order to verify interactions
     /// </summary>
-    public interface IMessagingProvider : IDisposable
+    public interface IMessagingProvider : IAsyncDisposable
     {
         /// <summary>
         /// Scenarios configured for the provider
diff --git a/src/PactNet.Abstractions/Verifier/Messaging/Scenario.cs b/src/PactNet.Abstractions/Verifier/Messaging/Scenario.cs
index 1fe7e041..dac8cf44 100644
--- a/src/PactNet.Abstractions/Verifier/Messaging/Scenario.cs
+++ b/src/PactNet.Abstractions/Verifier/Messaging/Scenario.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Text.Json;
+using System.Threading.Tasks;
 
 namespace PactNet.Verifier.Messaging
 {
@@ -8,7 +9,7 @@ namespace PactNet.Verifier.Messaging
     /// </summary>
     public class Scenario
     {
-        private readonly Func<dynamic> factory;
+        private readonly Func<Task<dynamic>> factory;
 
         /// <summary>
         /// The description of the scenario
@@ -30,7 +31,16 @@ public class Scenario
         /// </summary>
         /// <param name="description">the scenario description</param>
         /// <param name="factory">Message content factory</param>
-        public Scenario(string description, Func<dynamic> factory)
+        public Scenario(string description, Func<dynamic> factory) : this(description, Wrap(factory))
+        {
+        }
+
+        /// <summary>
+        /// Creates an instance of <see cref="Scenario"/>
+        /// </summary>
+        /// <param name="description">the scenario description</param>
+        /// <param name="factory">Message content factory</param>
+        public Scenario(string description, Func<Task<dynamic>> factory)
         {
             this.Description = !string.IsNullOrWhiteSpace(description) ? description : throw new ArgumentException("Description cannot be null or empty");
             this.factory = factory ?? throw new ArgumentNullException(nameof(factory));
@@ -44,6 +54,20 @@ public Scenario(string description, Func<dynamic> factory)
         /// <param name="metadata">the metadata</param>
         /// <param name="settings">Custom JSON serializer settings</param>
         public Scenario(string description, Func<dynamic> factory, dynamic metadata, JsonSerializerOptions settings)
+            : this(description, Wrap(factory))
+        {
+            this.Metadata = metadata;
+            this.JsonSettings = settings;
+        }
+
+        /// <summary>
+        /// Creates an instance of <see cref="Scenario"/>
+        /// </summary>
+        /// <param name="description">the scenario description</param>
+        /// <param name="factory">Message content factory</param>
+        /// <param name="metadata">the metadata</param>
+        /// <param name="settings">Custom JSON serializer settings</param>
+        public Scenario(string description, Func<Task<dynamic>> factory, dynamic metadata, JsonSerializerOptions settings)
             : this(description, factory)
         {
             this.Metadata = metadata;
@@ -51,12 +75,20 @@ public Scenario(string description, Func<dynamic> factory, dynamic metadata, Jso
         }
 
         /// <summary>
-        /// Invoke a scenario
+        /// Invoke a scenario to generate message content
         /// </summary>
         /// <returns>The scenario message content</returns>
-        public dynamic Invoke()
+        public async Task<dynamic> InvokeAsync() => await this.factory();
+
+        /// <summary>
+        /// Wraps a sync factory to be async
+        /// </summary>
+        /// <param name="factory">Sync factory</param>
+        /// <returns>Async factory</returns>
+        private static Func<Task<dynamic>> Wrap(Func<dynamic> factory) => () =>
         {
-            return this.factory.Invoke();
-        }
+            dynamic d = factory();
+            return Task.FromResult(d);
+        };
     }
 }
diff --git a/src/PactNet/Verifier/Messaging/MessageScenarioBuilder.cs b/src/PactNet/Verifier/Messaging/MessageScenarioBuilder.cs
index 06b483f4..8db626bf 100644
--- a/src/PactNet/Verifier/Messaging/MessageScenarioBuilder.cs
+++ b/src/PactNet/Verifier/Messaging/MessageScenarioBuilder.cs
@@ -11,7 +11,7 @@ internal class MessageScenarioBuilder : IMessageScenarioBuilder
     {
         private readonly string description;
 
-        private Func<dynamic> factory;
+        private Func<Task<dynamic>> factory;
         private dynamic metadata = new { ContentType = "application/json" };
         private JsonSerializerOptions settings;
 
@@ -36,23 +36,37 @@ public IMessageScenarioBuilder WithMetadata(dynamic metadata)
         }
 
         /// <summary>
-        /// Set the action of the scenario
+        /// Set the content factory of the scenario. The factory is invoked each time the scenario is required.
         /// </summary>
         /// <param name="factory">Content factory</param>
         public void WithContent(Func<dynamic> factory)
         {
-            this.factory = factory ?? throw new ArgumentNullException(nameof(factory));
+            if (factory == null)
+            {
+                throw new ArgumentNullException(nameof(factory));
+            }
+
+            this.WithAsyncContent(() => Task.FromResult<dynamic>(factory()));
         }
 
         /// <summary>
-        /// Set the content of the scenario
+        /// Set the content factory of the scenario. The factory is invoked each time the scenario is required.
         /// </summary>
         /// <param name="factory">Content factory</param>
         /// <param name="settings">Custom JSON serializer settings</param>
         public void WithContent(Func<dynamic> factory, JsonSerializerOptions settings)
         {
-            this.factory = factory ?? throw new ArgumentNullException(nameof(factory));
-            this.settings = settings ?? throw new ArgumentNullException(nameof(settings));
+            if (factory == null)
+            {
+                throw new ArgumentNullException(nameof(factory));
+            }
+
+            if (settings == null)
+            {
+                throw new ArgumentNullException(nameof(settings));
+            }
+
+            this.WithAsyncContent(() => Task.FromResult<dynamic>(factory()), settings);
         }
 
         /// <summary>
@@ -61,12 +75,7 @@ public void WithContent(Func<dynamic> factory, JsonSerializerOptions settings)
         /// <param name="factory">Content factory</param>
         public void WithAsyncContent(Func<Task<dynamic>> factory)
         {
-            if (factory == null)
-            {
-                throw new ArgumentNullException(nameof(factory));
-            }
-
-            this.WithContent(() => factory().GetAwaiter().GetResult());
+            this.factory = factory ?? throw new ArgumentNullException(nameof(factory));
         }
 
         /// <summary>
@@ -76,12 +85,8 @@ public void WithAsyncContent(Func<Task<dynamic>> factory)
         /// <param name="settings">Custom JSON serializer settings</param>
         public void WithAsyncContent(Func<Task<dynamic>> factory, JsonSerializerOptions settings)
         {
-            if (factory == null)
-            {
-                throw new ArgumentNullException(nameof(factory));
-            }
-
-            this.WithContent(() => factory().GetAwaiter().GetResult(), settings);
+            this.factory = factory ?? throw new ArgumentNullException(nameof(factory));
+            this.settings = settings ?? throw new ArgumentNullException(nameof(settings));
         }
 
         /// <summary>
diff --git a/src/PactNet/Verifier/Messaging/MessageScenarios.cs b/src/PactNet/Verifier/Messaging/MessageScenarios.cs
index 25b23af7..6c5df8c0 100644
--- a/src/PactNet/Verifier/Messaging/MessageScenarios.cs
+++ b/src/PactNet/Verifier/Messaging/MessageScenarios.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Threading.Tasks;
 
 namespace PactNet.Verifier.Messaging
 {
@@ -35,6 +36,18 @@ public MessageScenarios()
         /// <param name="description">Scenario description</param>
         /// <param name="factory">Message content factory</param>
         public IMessageScenarios Add(string description, Func<dynamic> factory)
+        {
+            Func<Task<dynamic>> asyncFactory = () => Task.FromResult<dynamic>(factory());
+
+            return this.Add(description, asyncFactory);
+        }
+
+        /// <summary>
+        /// Add a message scenario
+        /// </summary>
+        /// <param name="description">Scenario description</param>
+        /// <param name="factory">Message content factory</param>
+        public IMessageScenarios Add(string description, Func<Task<dynamic>> factory)
         {
             var scenario = new Scenario(description, factory, JsonMetadata, null);
             this.scenarios.Add(description, scenario);
diff --git a/src/PactNet/Verifier/Messaging/MessagingProvider.cs b/src/PactNet/Verifier/Messaging/MessagingProvider.cs
index 5b70cef5..d112bf5d 100644
--- a/src/PactNet/Verifier/Messaging/MessagingProvider.cs
+++ b/src/PactNet/Verifier/Messaging/MessagingProvider.cs
@@ -7,6 +7,7 @@
 using System.Text;
 using System.Text.Json;
 using System.Threading;
+using System.Threading.Tasks;
 using PactNet.Exceptions;
 using PactNet.Internal;
 
@@ -27,9 +28,10 @@ internal class MessagingProvider : IMessagingProvider
         };
 
         private readonly PactVerifierConfig config;
-        private readonly Thread thread;
+        private readonly CancellationTokenSource cts;
 
         private HttpListener server;
+        private Task serverTask;
         private JsonSerializerOptions defaultSettings;
 
         /// <summary>
@@ -46,7 +48,7 @@ public MessagingProvider(PactVerifierConfig config, IMessageScenarios scenarios)
         {
             this.config = config;
             this.Scenarios = scenarios;
-            this.thread = new Thread(this.HandleRequest);
+            this.cts = new CancellationTokenSource();
         }
 
         /// <summary>
@@ -59,7 +61,7 @@ public Uri Start(JsonSerializerOptions settings)
             Guard.NotNull(settings, nameof(settings));
             this.defaultSettings = settings;
 
-            while (true)
+            while (!this.cts.Token.IsCancellationRequested)
             {
                 Uri uri;
 
@@ -85,9 +87,11 @@ public Uri Start(JsonSerializerOptions settings)
                     throw new PactFailureException("Unable to start the internal messaging server", e);
                 }
 
-                this.thread.Start();
+                this.serverTask = Task.Run(this.HandleRequest, this.cts.Token);
                 return uri;
             }
+
+            return null;
         }
 
         /// <summary>
@@ -118,21 +122,21 @@ private static int FindUnusedPort()
         /// <summary>
         /// Handle an incoming request from the Pact Core messaging driver
         /// </summary>
-        private void HandleRequest()
+        private async Task HandleRequest()
         {
             this.config.WriteLine("Messaging provider successfully started");
 
-            while (this.server.IsListening)
+            while (this.server.IsListening && !this.cts.Token.IsCancellationRequested)
             {
                 HttpListenerContext context;
 
                 try
                 {
-                    context = this.server.GetContext();
+                    context = await this.server.GetContextAsync().ConfigureAwait(false);
                 }
                 catch (HttpListenerException)
                 {
-                    // this thread blocks waiting for the next request, and if the server stops then this exception is raised
+                    // this task blocks waiting for the next request, and if the server stops then this exception is raised
                     break;
                 }
 
@@ -146,8 +150,10 @@ private void HandleRequest()
 
                 try
                 {
+                    // buffer the body instead of async deserialisation so we can log it if anything goes wrong
                     var reader = new StreamReader(context.Request.InputStream);
-                    string body = reader.ReadToEnd();
+                    string body = await reader.ReadToEndAsync().ConfigureAwait(false);
+
                     interaction = JsonSerializer.Deserialize<MessageInteraction>(body, InteractionSettings);
 
                     if (string.IsNullOrWhiteSpace(interaction.Description))
@@ -162,8 +168,10 @@ private void HandleRequest()
                     continue;
                 }
 
-                this.HandleInteraction(context, interaction);
+                await this.HandleInteractionAsync(context, interaction).ConfigureAwait(false);
             }
+
+            this.config.WriteLine("Messaging provider stopped");
         }
 
         /// <summary>
@@ -171,7 +179,7 @@ private void HandleRequest()
         /// </summary>
         /// <param name="context">HTTP context</param>
         /// <param name="interaction">Interaction</param>
-        private void HandleInteraction(HttpListenerContext context, MessageInteraction interaction)
+        private async Task HandleInteractionAsync(HttpListenerContext context, MessageInteraction interaction)
         {
             try
             {
@@ -194,7 +202,7 @@ private void HandleInteraction(HttpListenerContext context, MessageInteraction i
                     this.config.WriteLine($"Metadata: {stringifyMetadata}");
                 }
 
-                dynamic content = scenario.Invoke();
+                dynamic content = await scenario.InvokeAsync().ConfigureAwait(false);
                 string response = JsonSerializer.Serialize(content, settings);
                 this.OkResponse(context, response);
 
@@ -278,19 +286,24 @@ private void WriteOutput(HttpListenerResponse response, HttpStatusCode status, s
         /// <summary>
         /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>
-        public void Dispose()
+        public async ValueTask DisposeAsync()
         {
             GC.SuppressFinalize(this);
 
             try
             {
+                this.cts.Cancel(false);
+
                 this.server?.Stop();
+                await this.serverTask;
                 this.server?.Close();
             }
             catch
             {
                 // ignore - we're shutting down anyway
             }
+
+            this.config.WriteLine("Messaging provider disposed");
         }
     }
 }
diff --git a/src/PactNet/Verifier/PactVerifier.cs b/src/PactNet/Verifier/PactVerifier.cs
index 09d7a0c5..32ad0705 100644
--- a/src/PactNet/Verifier/PactVerifier.cs
+++ b/src/PactNet/Verifier/PactVerifier.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Text.Json;
+using System.Threading.Tasks;
 using PactNet.Internal;
 using PactNet.Verifier.Messaging;
 
@@ -9,7 +10,7 @@ namespace PactNet.Verifier
     /// <summary>
     /// Pact verifier
     /// </summary>
-    public class PactVerifier : IPactVerifier, IDisposable
+    public class PactVerifier : IPactVerifier, IAsyncDisposable
     {
         private const string VerifierNotInitialised = $"You must add at least one verifier transport by calling {nameof(WithHttpEndpoint)} and/or {nameof(WithMessages)}";
 
@@ -213,12 +214,21 @@ public IPactVerifierSource WithPactBrokerSource(Uri brokerBaseUri, Action<IPactB
         }
 
         /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// Performs application-defined tasks associated with freeing, releasing, or
+        /// resetting unmanaged resources asynchronously.
         /// </summary>
-        public void Dispose()
+        public async ValueTask DisposeAsync()
         {
-            this.messagingProvider?.Dispose();
-            this.provider?.Dispose();
+            if (this.provider is IAsyncDisposable providerAsyncDisposable)
+            {
+                await providerAsyncDisposable.DisposeAsync();
+            }
+            else
+            {
+                this.provider.Dispose();
+            }
+
+            await this.messagingProvider.DisposeAsync();
         }
     }
 }
diff --git a/tests/PactNet.Abstractions.Tests/PactNet.Abstractions.Tests.csproj b/tests/PactNet.Abstractions.Tests/PactNet.Abstractions.Tests.csproj
index 33213fec..90df8362 100644
--- a/tests/PactNet.Abstractions.Tests/PactNet.Abstractions.Tests.csproj
+++ b/tests/PactNet.Abstractions.Tests/PactNet.Abstractions.Tests.csproj
@@ -13,9 +13,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="xunit" Version="2.6.6" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/tests/PactNet.Abstractions.Tests/Verifier/Messaging/ScenarioTests.cs b/tests/PactNet.Abstractions.Tests/Verifier/Messaging/ScenarioTests.cs
index faf9ceb0..4684e07d 100644
--- a/tests/PactNet.Abstractions.Tests/Verifier/Messaging/ScenarioTests.cs
+++ b/tests/PactNet.Abstractions.Tests/Verifier/Messaging/ScenarioTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using FluentAssertions;
 using PactNet.Verifier.Messaging;
 using Xunit;
@@ -8,12 +9,12 @@ namespace PactNet.Abstractions.Tests.Verifier.Messaging
     public class ScenarioTests
     {
         [Fact]
-        public void InvokeScenario_Should_Invoke_Scenario_And_Return_Object()
+        public async Task InvokeScenario_Should_Invoke_Scenario_And_Return_Object()
         {
             object expected = new { field = "value" };
             var scenario = new Scenario("a scenario", () => expected);
 
-            object actual = scenario.Invoke();
+            object actual = await scenario.InvokeAsync();
 
             actual.Should().BeEquivalentTo(expected);
         }
@@ -23,7 +24,7 @@ public void Should_Be_Able_To_Get_Description_And_Metadata()
         {
             object expectedMetadata = new { key = "vvv" };
             var expectedDescription = "a scenario";
-            var scenario = new Scenario(expectedDescription, () => string.Empty, expectedMetadata, null);
+            var scenario = new Scenario(expectedDescription, () => (dynamic)string.Empty, expectedMetadata, null);
 
             Assert.Equal(expectedMetadata, scenario.Metadata);
             Assert.Equal(expectedDescription, scenario.Description);
@@ -35,7 +36,7 @@ public void Should_Be_Able_To_Get_Description_And_Metadata()
         [InlineData(" ")]
         public void Ctor_Should_Fail_If_Invalid_Description(string description)
         {
-            object expected = new { field = "value" };
+            dynamic expected = new { field = "value" };
             object expectedMetadata = new { key = "vvv" };
 
             Action actual = () => new Scenario(description, () => expected, expectedMetadata, null);
diff --git a/tests/PactNet.Tests/PactNet.Tests.csproj b/tests/PactNet.Tests/PactNet.Tests.csproj
index 98f360d6..447e72da 100644
--- a/tests/PactNet.Tests/PactNet.Tests.csproj
+++ b/tests/PactNet.Tests/PactNet.Tests.csproj
@@ -25,10 +25,10 @@
   <ItemGroup>
     <PackageReference Include="AutoFixture" Version="4.18.1" />
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="xunit" Version="2.6.6" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/tests/PactNet.Tests/Verifier/Messaging/MessageScenarioBuilderTests.cs b/tests/PactNet.Tests/Verifier/Messaging/MessageScenarioBuilderTests.cs
index c7969d35..7ef8fc20 100644
--- a/tests/PactNet.Tests/Verifier/Messaging/MessageScenarioBuilderTests.cs
+++ b/tests/PactNet.Tests/Verifier/Messaging/MessageScenarioBuilderTests.cs
@@ -42,12 +42,12 @@ public void WithMetadata_NullMetadata_ThrowsArgumentNullException()
         }
 
         [Fact]
-        public void WithContent_WhenCalled_SetsContent()
+        public async Task WithContent_WhenCalled_SetsContent()
         {
             object expected = new { Foo = 42 };
 
             this.builder.WithContent(() => expected);
-            object actual = this.builder.Build().Invoke();
+            object actual = await this.builder.Build().InvokeAsync();
 
             actual.Should().Be(expected);
         }
@@ -64,12 +64,12 @@ public void WithContent_WithCustomSettings_SetsSettings()
         }
 
         [Fact]
-        public void WithAsyncContent_WhenCalled_SetsContent()
+        public async Task WithAsyncContent_WhenCalled_SetsContent()
         {
             dynamic expected = new { Foo = 42 };
 
             this.builder.WithAsyncContent(() => Task.FromResult<dynamic>(expected));
-            object actual = this.builder.Build().Invoke();
+            object actual = await this.builder.Build().InvokeAsync();
 
             actual.Should().Be(expected);
         }
diff --git a/tests/PactNet.Tests/Verifier/Messaging/MessageScenariosTests.cs b/tests/PactNet.Tests/Verifier/Messaging/MessageScenariosTests.cs
index 3aafa298..a4229d2f 100644
--- a/tests/PactNet.Tests/Verifier/Messaging/MessageScenariosTests.cs
+++ b/tests/PactNet.Tests/Verifier/Messaging/MessageScenariosTests.cs
@@ -20,7 +20,7 @@ public MessageScenariosTests()
         [Fact]
         public void Add_SimpleScenario_AddsScenarioWithJsonMetadata()
         {
-            Func<dynamic> factory = () => new { Foo = 42 };
+            Func<Task<dynamic>> factory = () => Task.FromResult((dynamic)new { Foo = 42 });
 
             this.scenarios.Add("description", factory);
 
diff --git a/tests/PactNet.Tests/Verifier/Messaging/MessagingProviderTests.cs b/tests/PactNet.Tests/Verifier/Messaging/MessagingProviderTests.cs
index db41fdd4..291bbf33 100644
--- a/tests/PactNet.Tests/Verifier/Messaging/MessagingProviderTests.cs
+++ b/tests/PactNet.Tests/Verifier/Messaging/MessagingProviderTests.cs
@@ -16,7 +16,7 @@
 
 namespace PactNet.Tests.Verifier.Messaging
 {
-    public class MessagingProviderTests : IDisposable
+    public class MessagingProviderTests : IAsyncDisposable
     {
         private static readonly JsonSerializerOptions Settings = new JsonSerializerOptions
         {
@@ -46,9 +46,9 @@ public MessagingProviderTests(ITestOutputHelper output)
             this.client = new HttpClient { BaseAddress = uri };
         }
 
-        public void Dispose()
+        public ValueTask DisposeAsync()
         {
-            this.provider.Dispose();
+            return this.provider.DisposeAsync();
         }
 
         [Fact]