From e9faf9bbfa8c41069ae5e8bf2caf013a51a2f484 Mon Sep 17 00:00:00 2001
From: E M <5089238+emizzle@users.noreply.github.com>
Date: Wed, 29 Apr 2026 21:27:29 +1000
Subject: [PATCH] Ensure test cleanup happens after each test

---
 Tests/DistTestCore/DistTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tests/DistTestCore/DistTest.cs b/Tests/DistTestCore/DistTest.cs
index 8cba6af9..b6ee7ec2 100644
--- a/Tests/DistTestCore/DistTest.cs
+++ b/Tests/DistTestCore/DistTest.cs
@@ -209,7 +209,7 @@ namespace DistTestCore
 
         private bool ShouldWaitForCleanup()
         {
-            return CurrentTestMethodHasAttribute<WaitForCleanupAttribute>();
+            return IsRunningInCluster() || CurrentTestMethodHasAttribute<WaitForCleanupAttribute>();
         }
 
         private bool ShouldUseLongTimeouts()