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()