diff --git a/src/Proto.Cluster.TestProvider/TestProvider.cs b/src/Proto.Cluster.TestProvider/TestProvider.cs
index 283a6b65ef..6cfdc3fa36 100644
--- a/src/Proto.Cluster.TestProvider/TestProvider.cs
+++ b/src/Proto.Cluster.TestProvider/TestProvider.cs
@@ -28,9 +28,8 @@ public TestProvider(TestProviderOptions options, InMemAgent agent)
         _agent = agent;
     }
 
-    public async Task StartMemberAsync(Cluster cluster)
+    public Task StartMemberAsync(Cluster cluster)
     {
-        await Task.Yield();
         var memberList = cluster.MemberList;
         var (host, port) = cluster.System.GetAddress();
         var kinds = cluster.GetClusterKinds();
@@ -47,26 +46,30 @@ public async Task StartMemberAsync(Cluster cluster)
                 Port = port
             }
         );
+
+        return Task.CompletedTask;
     }
 
-    public async Task StartClientAsync(Cluster cluster)
+    public Task StartClientAsync(Cluster cluster)
     {
-        await Task.Yield();
         var memberList = cluster.MemberList;
 
         _id = cluster.System.Id;
         _memberList = memberList;
         _agent.StatusUpdate += AgentOnStatusUpdate;
         _agent.ForceUpdate();
+
+        return Task.CompletedTask;
     }
 
-    public async Task ShutdownAsync(bool graceful)
+    public Task ShutdownAsync(bool graceful)
     {
-        await Task.Delay(100);
         Logger.LogDebug("Unregistering service {Service}", _id);
 
         _ttlReportTimer?.Stop();
         _agent.DeregisterService(_id);
+
+        return Task.CompletedTask;
     }
 
     private void AgentOnStatusUpdate(object sender, EventArgs e) => NotifyStatuses();