diff --git a/tests/Aspire.Hosting.NodeJs.Tests/NodeFunctionalTests.cs b/tests/Aspire.Hosting.NodeJs.Tests/NodeFunctionalTests.cs
index c67a3d19898..dcf8bbc5e39 100644
--- a/tests/Aspire.Hosting.NodeJs.Tests/NodeFunctionalTests.cs
+++ b/tests/Aspire.Hosting.NodeJs.Tests/NodeFunctionalTests.cs
@@ -18,7 +18,7 @@ public NodeFunctionalTests(NodeAppFixture nodeJsFixture)
 
     [Fact]
     [RequiresTools(["node"])]
-    [QuarantinedTest("https://github.com/dotnet/aspire/issues/4508")]
+    [ActiveIssue("https://github.com/dotnet/aspire/issues/4508", typeof(PlatformDetection), nameof(PlatformDetection.IsRunningFromAzdo))]
     public async Task VerifyNodeAppWorks()
     {
         using var cts = new CancellationTokenSource(TimeSpan.FromMinutes(1));
@@ -30,7 +30,7 @@ public async Task VerifyNodeAppWorks()
 
     [Fact]
     [RequiresTools(["npm"])]
-    [QuarantinedTest("https://github.com/dotnet/aspire/issues/4508")]
+    [ActiveIssue("https://github.com/dotnet/aspire/issues/4508", typeof(PlatformDetection), nameof(PlatformDetection.IsRunningFromAzdo))]
     public async Task VerifyNpmAppWorks()
     {
         using var cts = new CancellationTokenSource(TimeSpan.FromMinutes(1));
diff --git a/tests/Aspire.Hosting.Oracle.Tests/OracleFunctionalTests.cs b/tests/Aspire.Hosting.Oracle.Tests/OracleFunctionalTests.cs
index 91b418e7825..5b19d5b3539 100644
--- a/tests/Aspire.Hosting.Oracle.Tests/OracleFunctionalTests.cs
+++ b/tests/Aspire.Hosting.Oracle.Tests/OracleFunctionalTests.cs
@@ -14,7 +14,7 @@
 
 namespace Aspire.Hosting.Oracle.Tests;
 
-[QuarantinedTest("https://github.com/dotnet/aspire/issues/5362")]
+[ActiveIssue("https://github.com/dotnet/aspire/issues/5362", typeof(PlatformDetection), nameof(PlatformDetection.IsRunningOnCI))]
 public class OracleFunctionalTests(ITestOutputHelper testOutputHelper)
 {
     // Folders created for mounted folders need to be granted specific permissions
@@ -26,7 +26,7 @@ public class OracleFunctionalTests(ITestOutputHelper testOutputHelper)
 
     private const string DatabaseReadyText = "Completed: ALTER DATABASE OPEN";
 
-    [Fact(Skip = "https://github.com/dotnet/aspire/issues/5362")]
+    [Fact]
     [RequiresDocker]
     public async Task VerifyEfOracle()
     {
@@ -67,7 +67,7 @@ public async Task VerifyEfOracle()
         Assert.Equal("BatMobile", cars[0].Brand);
     }
 
-    [Theory(Skip = "https://github.com/dotnet/aspire/issues/5362")]
+    [Theory]
     [InlineData(true)]
     [InlineData(false, Skip = "https://github.com/dotnet/aspire/issues/5191")]
     [RequiresDocker]
@@ -242,7 +242,7 @@ await pipeline.ExecuteAsync(async token =>
         }
     }
 
-    [Theory(Skip = "https://github.com/dotnet/aspire/issues/5362")]
+    [Theory]
     [InlineData(true)]
     [InlineData(false, Skip = "https://github.com/dotnet/aspire/issues/5190")]
     [RequiresDocker]
@@ -345,7 +345,7 @@ await pipeline.ExecuteAsync(async token =>
         }
     }
 
-    [Fact(Skip = "https://github.com/dotnet/aspire/issues/5362")]
+    [Fact]
     [RequiresDocker]
     public async Task VerifyWaitForOnOracleBlocksDependentResources()
     {
diff --git a/tests/Aspire.Hosting.Tests/DistributedApplicationTests.cs b/tests/Aspire.Hosting.Tests/DistributedApplicationTests.cs
index fe92fdc926a..73f6c3ee459 100644
--- a/tests/Aspire.Hosting.Tests/DistributedApplicationTests.cs
+++ b/tests/Aspire.Hosting.Tests/DistributedApplicationTests.cs
@@ -914,6 +914,7 @@ public async Task ProxylessEndpointWithoutPortThrows()
     }
 
     [Fact]
+    [QuarantinedTest("https://github.com/dotnet/aspire/issues/8728")]
     public async Task ProxylessEndpointWorks()
     {
         const string testName = "proxyless-endpoint-works";
diff --git a/tests/Aspire.TestUtilities/PlatformDetection.cs b/tests/Aspire.TestUtilities/PlatformDetection.cs
index 000337049ec..49f949e85ba 100644
--- a/tests/Aspire.TestUtilities/PlatformDetection.cs
+++ b/tests/Aspire.TestUtilities/PlatformDetection.cs
@@ -9,6 +9,7 @@ public static class PlatformDetection
     public static bool IsRunningOnHelix => Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null;
     public static bool IsRunningOnGithubActions => Environment.GetEnvironmentVariable("GITHUB_JOB") is not null;
     public static bool IsRunningOnCI => IsRunningOnAzdoBuildMachine || IsRunningOnHelix || IsRunningOnGithubActions;
+    public static bool IsRunningFromAzdo => IsRunningOnAzdoBuildMachine || IsRunningOnHelix;
     public static bool IsRunningPRValidation => IsRunningOnGithubActions;
 
     public static bool IsWindows => OperatingSystem.IsWindows();