diff --git a/tests/Aspire.Cli.Tests/Commands/DeployCommandTests.cs b/tests/Aspire.Cli.Tests/Commands/DeployCommandTests.cs
index 13b91945186..017548da83b 100644
--- a/tests/Aspire.Cli.Tests/Commands/DeployCommandTests.cs
+++ b/tests/Aspire.Cli.Tests/Commands/DeployCommandTests.cs
@@ -7,7 +7,6 @@
 using Aspire.Cli.Tests.TestServices;
 using Microsoft.Extensions.DependencyInjection;
 using Aspire.Cli.Utils;
-using Aspire.TestUtilities;
 
 namespace Aspire.Cli.Tests.Commands;
 
@@ -267,7 +266,6 @@ public async Task DeployCommandSucceedsEndToEnd()
     }
 
     [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspire/issues/11217")]
     public async Task DeployCommandIncludesDeployFlagInArguments()
     {
         using var tempRepo = TemporaryWorkspace.Create(outputHelper);
diff --git a/tests/Aspire.Cli.Tests/Commands/PublishCommandTests.cs b/tests/Aspire.Cli.Tests/Commands/PublishCommandTests.cs
index 1a125e51a55..51c74052c63 100644
--- a/tests/Aspire.Cli.Tests/Commands/PublishCommandTests.cs
+++ b/tests/Aspire.Cli.Tests/Commands/PublishCommandTests.cs
@@ -5,7 +5,6 @@
 using Aspire.Cli.Interaction;
 using Aspire.Cli.Tests.Utils;
 using Aspire.Cli.Tests.TestServices;
-using Aspire.TestUtilities;
 using Microsoft.Extensions.DependencyInjection;
 using Aspire.Cli.Utils;
 
@@ -162,7 +161,6 @@ public async Task PublishCommandFailsWhenAppHostCrashesBeforeBackchannelEstablis
     }
 
     [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspire/issues/9999")]
     public async Task PublishCommandWithoutOutputPathUsesDefaultSubdirectory()
     {
         // Arrange
@@ -233,7 +231,6 @@ public async Task PublishCommandWithoutOutputPathUsesDefaultSubdirectory()
     }
 
     [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspire/issues/9870")]
     public async Task PublishCommandSucceedsEndToEnd()
     {
         // Arrange
diff --git a/tests/Aspire.Cli.Tests/TestServices/TestAppHostBackchannel.cs b/tests/Aspire.Cli.Tests/TestServices/TestAppHostBackchannel.cs
index c505ee081a6..5f66c343719 100644
--- a/tests/Aspire.Cli.Tests/TestServices/TestAppHostBackchannel.cs
+++ b/tests/Aspire.Cli.Tests/TestServices/TestAppHostBackchannel.cs
@@ -120,6 +120,9 @@ public async IAsyncEnumerable<PublishingActivity> GetPublishingActivitiesAsync([
         }
         else
         {
+            // Yield to ensure proper async behavior and prevent race conditions
+            await Task.Yield();
+            
             yield return new PublishingActivity
             {
                 Type = PublishingActivityTypes.Step,
@@ -208,6 +211,17 @@ public async IAsyncEnumerable<PublishingActivity> GetPublishingActivitiesAsync([
                     StepId = null
                 }
             };
+            yield return new PublishingActivity
+            {
+                Type = PublishingActivityTypes.PublishComplete,
+                Data = new PublishingActivityData
+                {
+                    Id = PublishingActivityTypes.PublishComplete,
+                    StatusText = "Publishing completed",
+                    CompletionState = CompletionStates.Completed,
+                    StepId = null
+                }
+            };
         }
     }