diff --git a/src/contrib/cluster/Akka.Cluster.Tools.Tests.MultiNode/ClusterClient/ClusterClientSpec.cs b/src/contrib/cluster/Akka.Cluster.Tools.Tests.MultiNode/ClusterClient/ClusterClientSpec.cs
index 635284aafcb..d78b90d173e 100644
--- a/src/contrib/cluster/Akka.Cluster.Tools.Tests.MultiNode/ClusterClient/ClusterClientSpec.cs
+++ b/src/contrib/cluster/Akka.Cluster.Tools.Tests.MultiNode/ClusterClient/ClusterClientSpec.cs
@@ -503,6 +503,7 @@ public void ClusterClient_must_reestablish_connection_to_another_receptionist_wh
                     if (msg.Equals("hi again")) return msg;
                     else throw new Exception("Unexpected message: " + msg);
                 });
+                EnterBarrier("verified-4");
 
                 RunOn(() =>
                 {
diff --git a/src/contrib/cluster/Akka.Cluster.Tools.Tests.MultiNode/Singleton/ClusterSingletonManagerStartupSpec.cs b/src/contrib/cluster/Akka.Cluster.Tools.Tests.MultiNode/Singleton/ClusterSingletonManagerStartupSpec.cs
index 8ca36e1eaed..4bcbbc8a1f1 100644
--- a/src/contrib/cluster/Akka.Cluster.Tools.Tests.MultiNode/Singleton/ClusterSingletonManagerStartupSpec.cs
+++ b/src/contrib/cluster/Akka.Cluster.Tools.Tests.MultiNode/Singleton/ClusterSingletonManagerStartupSpec.cs
@@ -31,6 +31,7 @@ public ClusterSingletonManagerStartupConfig()
             CommonConfig = ConfigurationFactory.ParseString(@"
                 akka.loglevel = INFO
                 akka.actor.provider = ""Akka.Cluster.ClusterActorRefProvider, Akka.Cluster""
+                akka.remote.retry-gate-closed-for = 1s #fast restart
                 akka.remote.log-remote-lifecycle-events = off
                 akka.cluster.auto-down-unreachable-after = 0s")
             .WithFallback(ClusterSingletonManager.DefaultConfig())
diff --git a/src/core/Akka.MultiNodeTestRunner/Program.cs b/src/core/Akka.MultiNodeTestRunner/Program.cs
index 4ed3b4efe9e..b66e3924a35 100644
--- a/src/core/Akka.MultiNodeTestRunner/Program.cs
+++ b/src/core/Akka.MultiNodeTestRunner/Program.cs
@@ -156,7 +156,7 @@ static void Main(string[] args)
                                     } -Dmultinode.listen-address={listenAddress} -Dmultinode.listen-port={listenPort}";
                             var nodeIndex = nodeTest.Node;
                             //TODO: might need to do some validation here to avoid the 260 character max path error on Windows
-                            var folder = Directory.CreateDirectory(Path.Combine(OutputDirectory, nodeTest.MethodName));
+                            var folder = Directory.CreateDirectory(Path.Combine(OutputDirectory, nodeTest.TestName));
                             var logFilePath = Path.Combine(folder.FullName, "node" + nodeIndex + ".txt");
                             var fileActor =
                                 TestRunSystem.ActorOf(Props.Create(() => new FileSystemAppenderActor(logFilePath)));
diff --git a/src/core/Akka.Remote.TestKit/BarrierCoordinator.cs b/src/core/Akka.Remote.TestKit/BarrierCoordinator.cs
index 444c87922b6..8c8b81d8b86 100644
--- a/src/core/Akka.Remote.TestKit/BarrierCoordinator.cs
+++ b/src/core/Akka.Remote.TestKit/BarrierCoordinator.cs
@@ -244,7 +244,7 @@ public override int GetHashCode()
         public sealed class WrongBarrierException : Exception
         {
             public WrongBarrierException(string barrier, IActorRef client, Data barrierData)
-                : base($"tried to enter '{barrier}' while we were waiting for '{barrierData.Barrier}'")
+                : base($"[{client}] tried to enter '{barrier}' while we were waiting for '{barrierData.Barrier}'")
             {
                 BarrierData = barrierData;
                 Client = client;
diff --git a/src/core/Akka.Remote.TestKit/Extension.cs b/src/core/Akka.Remote.TestKit/Extension.cs
index edf04f07f09..e46fa135603 100644
--- a/src/core/Akka.Remote.TestKit/Extension.cs
+++ b/src/core/Akka.Remote.TestKit/Extension.cs
@@ -82,6 +82,9 @@ public TestConductor(ActorSystem system)
         }
     }
 
+    /// <summary>
+    /// Settings used to operate the <see cref="TestConductor"/>.
+    /// </summary>
     public class TestConductorSettings
     {
         readonly TimeSpan _connectTimeout;
diff --git a/src/core/Akka.Remote.TestKit/Player.cs b/src/core/Akka.Remote.TestKit/Player.cs
index 5b7c7f69907..118b9882ea6 100644
--- a/src/core/Akka.Remote.TestKit/Player.cs
+++ b/src/core/Akka.Remote.TestKit/Player.cs
@@ -136,7 +136,7 @@ public void Enter(TimeSpan timeout, ImmutableList<string> names)
                     var askTimeout = barrierTimeout + Settings.QueryTimeout;
                     // Need to force barrier to wait here, so we can pass along a "fail barrier" message in the event
                     // of a failed operation
-                    _client.Ask(new ToServer<EnterBarrier>(new EnterBarrier(name, barrierTimeout)), askTimeout).Wait();
+                    var result = _client.Ask(new ToServer<EnterBarrier>(new EnterBarrier(name, barrierTimeout)), askTimeout).Result;
                 }
                 catch (AggregateException)
                 {