diff --git a/tests/Aspire.Cli.EndToEnd.Tests/AgentCommandTests.cs b/tests/Aspire.Cli.EndToEnd.Tests/AgentCommandTests.cs
index 09a2155a8f0..182b42d3230 100644
--- a/tests/Aspire.Cli.EndToEnd.Tests/AgentCommandTests.cs
+++ b/tests/Aspire.Cli.EndToEnd.Tests/AgentCommandTests.cs
@@ -46,7 +46,7 @@ public async Task AgentCommands_AllHelpOutputs_AreCorrect()
         await auto.WaitUntilAsync(
             s => s.ContainsText("mcp") && s.ContainsText("init"),
             timeout: TimeSpan.FromSeconds(30), description: "agent help showing mcp and init subcommands");
-        await auto.WaitForSuccessPromptAsync(counter);
+        await auto.WaitForSuccessPromptFailFastAsync(counter);
 
         // Test 2: aspire agent mcp --help
         await auto.TypeAsync("aspire agent mcp --help");
@@ -66,7 +66,7 @@ await auto.WaitUntilAsync(
         await auto.WaitUntilAsync(
             s => s.ContainsText("tools") && s.ContainsText("call"),
             timeout: TimeSpan.FromSeconds(30), description: "mcp help showing tools and call subcommands");
-        await auto.WaitForSuccessPromptAsync(counter);
+        await auto.WaitForSuccessPromptFailFastAsync(counter);
 
         // Test 5: aspire mcp tools --help
         await auto.TypeAsync("aspire mcp tools --help");
@@ -186,7 +186,7 @@ public async Task DoctorCommand_DetectsDeprecatedAgentConfig()
         await auto.WaitUntilAsync(
             s => s.ContainsText("dev-certs") && s.ContainsText("deprecated") && s.ContainsText("aspire agent init"),
             timeout: TimeSpan.FromSeconds(60), description: "doctor output with deprecated warning and fix suggestion");
-        await auto.WaitForSuccessPromptAsync(counter);
+        await auto.WaitForSuccessPromptFailFastAsync(counter);
 
         await auto.TypeAsync("exit");
         await auto.EnterAsync();
diff --git a/tests/Aspire.Cli.EndToEnd.Tests/BannerTests.cs b/tests/Aspire.Cli.EndToEnd.Tests/BannerTests.cs
index d8f3128413d..a5f459418f6 100644
--- a/tests/Aspire.Cli.EndToEnd.Tests/BannerTests.cs
+++ b/tests/Aspire.Cli.EndToEnd.Tests/BannerTests.cs
@@ -49,7 +49,7 @@ public async Task Banner_DisplayedOnFirstRun()
         await auto.WaitUntilAsync(
             s => s.ContainsText(RootCommandStrings.BannerWelcomeText) && s.ContainsText("Telemetry"),
             timeout: TimeSpan.FromSeconds(30), description: "waiting for banner and telemetry notice on first run");
-        await auto.WaitForSuccessPromptAsync(counter);
+        await auto.WaitForSuccessPromptFailFastAsync(counter);
         await auto.TypeAsync("exit");
         await auto.EnterAsync();
 
@@ -81,7 +81,7 @@ public async Task Banner_DisplayedWithExplicitFlag()
         await auto.WaitUntilAsync(
             s => s.ContainsText(RootCommandStrings.BannerWelcomeText) && s.ContainsText("CLI"),
             timeout: TimeSpan.FromSeconds(30), description: "waiting for banner with version info");
-        await auto.WaitForSuccessPromptAsync(counter);
+        await auto.WaitForSuccessPromptFailFastAsync(counter);
         await auto.TypeAsync("exit");
         await auto.EnterAsync();
 
@@ -129,7 +129,7 @@ await auto.WaitUntilAsync(s =>
             // Only return true once the help hint is visible at the end of the output
             return s.ContainsText(HelpGroupStrings.HelpHint);
         }, timeout: TimeSpan.FromSeconds(30), description: "waiting for help output to complete");
-        await auto.WaitForSuccessPromptAsync(counter);
+        await auto.WaitForSuccessPromptFailFastAsync(counter);
         await auto.TypeAsync("exit");
         await auto.EnterAsync();
 
diff --git a/tests/Aspire.Cli.EndToEnd.Tests/CentralPackageManagementTests.cs b/tests/Aspire.Cli.EndToEnd.Tests/CentralPackageManagementTests.cs
index 099501c4689..c656afaeeb4 100644
--- a/tests/Aspire.Cli.EndToEnd.Tests/CentralPackageManagementTests.cs
+++ b/tests/Aspire.Cli.EndToEnd.Tests/CentralPackageManagementTests.cs
@@ -198,7 +198,7 @@ await auto.WaitUntilAsync(s =>
             await auto.EnterAsync();
         }
 
-        await auto.WaitForSuccessPromptAsync(counter);
+        await auto.WaitForSuccessPromptFailFastAsync(counter);
 
         // Verify the AppHost project does not end up with a version-pinned Redis PackageReference.
         {
diff --git a/tests/Aspire.Cli.EndToEnd.Tests/DoctorCommandTests.cs b/tests/Aspire.Cli.EndToEnd.Tests/DoctorCommandTests.cs
index de658b1dd95..2450f6ccb88 100644
--- a/tests/Aspire.Cli.EndToEnd.Tests/DoctorCommandTests.cs
+++ b/tests/Aspire.Cli.EndToEnd.Tests/DoctorCommandTests.cs
@@ -46,7 +46,7 @@ public async Task DoctorCommand_WithoutSslCertDir_ShowsPartiallyTrusted()
         await auto.WaitUntilAsync(
             s => s.ContainsText("dev-certs") && s.ContainsText("partially trusted"),
             timeout: TimeSpan.FromSeconds(60), description: "doctor to complete with partial trust warning");
-        await auto.WaitForSuccessPromptAsync(counter);
+        await auto.WaitForSuccessPromptFailFastAsync(counter);
         await auto.TypeAsync("exit");
         await auto.EnterAsync();
 
@@ -99,7 +99,7 @@ await auto.WaitUntilAsync(s =>
 
             return s.ContainsText("certificate is trusted");
         }, timeout: TimeSpan.FromSeconds(60), description: "doctor to complete with trusted certificate");
-        await auto.WaitForSuccessPromptAsync(counter);
+        await auto.WaitForSuccessPromptFailFastAsync(counter);
         await auto.TypeAsync("exit");
         await auto.EnterAsync();