diff --git a/build/Build.cs b/build/Build.cs
index 4b733c432..a45f90802 100644
--- a/build/Build.cs
+++ b/build/Build.cs
@@ -5,6 +5,7 @@
 using Nuke.Common.CI;
 using Nuke.Common.IO;
 using Nuke.Common.ProjectModel;
+using Nuke.Common.Tooling;
 using Nuke.Common.Tools.DotNet;
 using Nuke.Common.Tools.OctoVersion;
 using Nuke.Common.Utilities;
@@ -112,9 +113,10 @@ ITargetDefinition TestDefinition(ITargetDefinition targetDefinition, Target depe
                     .EnableNoBuild()
                     .EnableNoRestore()
                     .EnableBlameCrash()
+                    .EnableBlameCrashCollectAlways() // Lets make sure we can collect them.
                     .SetBlameCrashDumpType("full")
                     .EnableBlameHang()
-                    .SetBlameHangTimeout(TimeSpan.FromMinutes(20).TotalMilliseconds.ToString())
+                    .SetBlameHangTimeout("2000")
                     .SetBlameHangDumpType("full"));
 
             });
diff --git a/source/Halibut.Tests/Support/TestCases/ClientAndServiceTestCasesBuilder.cs b/source/Halibut.Tests/Support/TestCases/ClientAndServiceTestCasesBuilder.cs
index b3c0274da..ad6e6dc70 100644
--- a/source/Halibut.Tests/Support/TestCases/ClientAndServiceTestCasesBuilder.cs
+++ b/source/Halibut.Tests/Support/TestCases/ClientAndServiceTestCasesBuilder.cs
@@ -1,5 +1,7 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using Halibut.Tests.Util;
 
 namespace Halibut.Tests.Support.TestCases
@@ -42,18 +44,23 @@ public IEnumerable<ClientAndServiceTestCase> Build()
                         if (!forceClientProxyTypes.Any())
                         {
                             yield return new ClientAndServiceTestCase(serviceConnectionType, networkConditionTestCase, recommendedIterations, clientServiceTestVersion, null);
+                            Thread.Sleep(1000000000);
+                            Environment.Exit(-1);
+                            yield break;
                         }
                         else
                         {
                             if (clientServiceTestVersion.IsPreviousClient())
                             {
                                 yield return new ClientAndServiceTestCase(serviceConnectionType, networkConditionTestCase, recommendedIterations, clientServiceTestVersion, null);
+                                yield break;
                             }
                             else
                             {
                                 foreach (var forceClientProxyType in forceClientProxyTypes)
                                 {
                                     yield return new ClientAndServiceTestCase(serviceConnectionType, networkConditionTestCase, recommendedIterations, clientServiceTestVersion, forceClientProxyType);
+                                    yield break;
                                 }
                             }
                         }