diff --git a/core/Azure.Mcp.Core/tests/Azure.Mcp.Core.LiveTests/Services/Telemetry/LinuxInformationProviderTests.cs b/core/Azure.Mcp.Core/tests/Azure.Mcp.Core.LiveTests/Services/Telemetry/LinuxInformationProviderTests.cs
index 9b5a740475..572df2bbc9 100644
--- a/core/Azure.Mcp.Core/tests/Azure.Mcp.Core.LiveTests/Services/Telemetry/LinuxInformationProviderTests.cs
+++ b/core/Azure.Mcp.Core/tests/Azure.Mcp.Core.LiveTests/Services/Telemetry/LinuxInformationProviderTests.cs
@@ -14,7 +14,6 @@ namespace Azure.Mcp.Core.LiveTests.Services.Telemetry;
 public class LinuxInformationProviderTests
 {
     [Fact]
-    [Trait("Category", "Live")]
     public async Task GetOrCreateDeviceId_WorksCorrectly()
     {
         Assert.SkipUnless(RuntimeInformation.IsOSPlatform(OSPlatform.Linux),
diff --git a/core/Azure.Mcp.Core/tests/Azure.Mcp.Core.LiveTests/Services/Telemetry/MacOSXInformationProviderTests.cs b/core/Azure.Mcp.Core/tests/Azure.Mcp.Core.LiveTests/Services/Telemetry/MacOSXInformationProviderTests.cs
index 7239f86fab..ece758ab99 100644
--- a/core/Azure.Mcp.Core/tests/Azure.Mcp.Core.LiveTests/Services/Telemetry/MacOSXInformationProviderTests.cs
+++ b/core/Azure.Mcp.Core/tests/Azure.Mcp.Core.LiveTests/Services/Telemetry/MacOSXInformationProviderTests.cs
@@ -14,7 +14,6 @@ namespace Azure.Mcp.Core.LiveTests.Services.Telemetry;
 public class MacOSXInformationProviderTests
 {
     [Fact]
-    [Trait("Category", "Live")]
     public async Task GetOrCreateDeviceId_WorksCorrectly()
     {
         Assert.SkipUnless(RuntimeInformation.IsOSPlatform(OSPlatform.Linux),
diff --git a/core/Azure.Mcp.Core/tests/Azure.Mcp.Core.LiveTests/Services/Telemetry/WindowsInformationProviderTests.cs b/core/Azure.Mcp.Core/tests/Azure.Mcp.Core.LiveTests/Services/Telemetry/WindowsInformationProviderTests.cs
index 388423a5f3..3e70e5e919 100644
--- a/core/Azure.Mcp.Core/tests/Azure.Mcp.Core.LiveTests/Services/Telemetry/WindowsInformationProviderTests.cs
+++ b/core/Azure.Mcp.Core/tests/Azure.Mcp.Core.LiveTests/Services/Telemetry/WindowsInformationProviderTests.cs
@@ -14,7 +14,6 @@ namespace Azure.Mcp.Core.LiveTests.Services.Telemetry;
 public class WindowsInformationProviderTests
 {
     [Fact]
-    [Trait("Category", "Live")]
     public async Task GetOrCreateDeviceId_WorksCorrectly()
     {
         Assert.SkipUnless(RuntimeInformation.IsOSPlatform(OSPlatform.Windows),
diff --git a/servers/Azure.Mcp.Server/docs/new-command.md b/servers/Azure.Mcp.Server/docs/new-command.md
index 348ebd5732..fdb948e8b4 100644
--- a/servers/Azure.Mcp.Server/docs/new-command.md
+++ b/servers/Azure.Mcp.Server/docs/new-command.md
@@ -1068,6 +1068,14 @@ Guidelines:
    - ❌ Bad: `_service.{Operation}(Arg.Is<T>(t => t == value)).Returns(return)`
 - CancellationToken in mocks: Always use `Arg.Any<CancellationToken>()` for CancellationToken parameters when setting up mocks
 - CancellationToken in product code invocation: When invoking real product code objects in unit tests, use `TestContext.Current.CancellationToken` for the CancellationToken parameter
+- If any test mutates environment variables, to prevent conflicts between tests, the test project must:
+  - Reference project `$(RepoRoot)core\Azure.Mcp.Core\tests\Azure.Mcp.Tests\Azure.Mcp.Tests.csproj`
+  - Include an `AssemblyAttributes.cs` file with the following contents :
+    ```csharp
+    [assembly: Azure.Mcp.Tests.Helpers.ClearEnvironmentVariablesBeforeTest]
+    [assembly: Xunit.CollectionBehavior(Xunit.CollectionBehavior.CollectionPerAssembly)]
+    ```
+
 ### 7. Integration Tests
 
 Integration tests inherit from `CommandTestsBase` and use test fixtures:
@@ -1506,8 +1514,6 @@ catch {
 Integration tests should use the deployed infrastructure:
 
 ```csharp
-[Trait("Toolset", "{Toolset}")]
-[Trait("Category", "Live")]
 public class {Toolset}CommandTests( ITestOutputHelper output)
     : CommandTestsBase(output)
 {
diff --git a/tools/Azure.Mcp.Tools.Acr/tests/Azure.Mcp.Tools.Acr.LiveTests/AcrCommandTests.cs b/tools/Azure.Mcp.Tools.Acr/tests/Azure.Mcp.Tools.Acr.LiveTests/AcrCommandTests.cs
index 671c1e1b5c..18e985a6f5 100644
--- a/tools/Azure.Mcp.Tools.Acr/tests/Azure.Mcp.Tools.Acr.LiveTests/AcrCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.Acr/tests/Azure.Mcp.Tools.Acr.LiveTests/AcrCommandTests.cs
@@ -9,8 +9,6 @@
 
 namespace Azure.Mcp.Tools.Acr.LiveTests;
 
-[Trait("Area", "Acr")]
-[Trait("Category", "Live")]
 public class AcrCommandTests(ITestOutputHelper output)
     : CommandTestsBase(output)
 {
diff --git a/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.LiveTests/AppConfigCommandTests.cs b/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.LiveTests/AppConfigCommandTests.cs
index 7691d72d14..8cfd1dc02a 100644
--- a/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.LiveTests/AppConfigCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.LiveTests/AppConfigCommandTests.cs
@@ -336,7 +336,6 @@ public async Task Should_set_and_delete_appconfig_kv()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_set_and_get_appconfig_kv_with_content_type()
     {
         // arrange
@@ -392,7 +391,6 @@ public async Task Should_set_and_get_appconfig_kv_with_content_type()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_set_and_get_content_type_directly_using_service()
     {
         // arrange
@@ -423,7 +421,6 @@ await _appConfigService.SetKeyValue(
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_set_kv_with_single_tag()
     {
         // arrange
@@ -455,7 +452,6 @@ public async Task Should_set_kv_with_single_tag()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_set_kv_with_multiple_tags()
     {
         // arrange
@@ -492,7 +488,6 @@ public async Task Should_set_kv_with_multiple_tags()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_set_kv_with_tags_containing_spaces()
     {
         // arrange
diff --git a/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.UnitTests/Account/AccountListCommandTests.cs b/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.UnitTests/Account/AccountListCommandTests.cs
index b8368ad2b7..d1978ab2bf 100644
--- a/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.UnitTests/Account/AccountListCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.UnitTests/Account/AccountListCommandTests.cs
@@ -18,7 +18,6 @@
 
 namespace Azure.Mcp.Tools.AppConfig.UnitTests.Account;
 
-[Trait("Area", "AppConfig")]
 public class AccountListCommandTests
 {
     private readonly IServiceProvider _serviceProvider;
diff --git a/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.UnitTests/KeyValue/KeyValueDeleteCommandTests.cs b/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.UnitTests/KeyValue/KeyValueDeleteCommandTests.cs
index 7a7690d1a2..41d20ff062 100644
--- a/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.UnitTests/KeyValue/KeyValueDeleteCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.UnitTests/KeyValue/KeyValueDeleteCommandTests.cs
@@ -17,7 +17,6 @@
 
 namespace Azure.Mcp.Tools.AppConfig.UnitTests.KeyValue;
 
-[Trait("Area", "AppConfig")]
 public class KeyValueDeleteCommandTests
 {
     private readonly IServiceProvider _serviceProvider;
diff --git a/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.UnitTests/KeyValue/KeyValueGetCommandTests.cs b/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.UnitTests/KeyValue/KeyValueGetCommandTests.cs
index f4e87afa2f..b414e3779d 100644
--- a/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.UnitTests/KeyValue/KeyValueGetCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.UnitTests/KeyValue/KeyValueGetCommandTests.cs
@@ -18,7 +18,6 @@
 
 namespace Azure.Mcp.Tools.AppConfig.UnitTests.KeyValue;
 
-[Trait("Area", "AppConfig")]
 public class KeyValueGetCommandTests
 {
     private readonly IServiceProvider _serviceProvider;
diff --git a/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.UnitTests/KeyValue/KeyValueSetCommandTests.cs b/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.UnitTests/KeyValue/KeyValueSetCommandTests.cs
index 6beffc6256..16a54b802d 100644
--- a/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.UnitTests/KeyValue/KeyValueSetCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.UnitTests/KeyValue/KeyValueSetCommandTests.cs
@@ -17,7 +17,6 @@
 
 namespace Azure.Mcp.Tools.AppConfig.UnitTests.KeyValue;
 
-[Trait("Area", "AppConfig")]
 public class KeyValueSetCommandTests
 {
     private readonly IServiceProvider _serviceProvider;
diff --git a/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.UnitTests/KeyValue/Lock/KeyValueLockSetCommandTests.cs b/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.UnitTests/KeyValue/Lock/KeyValueLockSetCommandTests.cs
index f3c2008240..78a9e3c140 100644
--- a/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.UnitTests/KeyValue/Lock/KeyValueLockSetCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.UnitTests/KeyValue/Lock/KeyValueLockSetCommandTests.cs
@@ -17,7 +17,6 @@
 
 namespace Azure.Mcp.Tools.AppConfig.UnitTests.KeyValue.Lock;
 
-[Trait("Area", "AppConfig")]
 public class KeyValueLockSetCommandTests
 {
     private readonly IServiceProvider _serviceProvider;
diff --git a/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.UnitTests/Services/AppConfigServiceTests.cs b/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.UnitTests/Services/AppConfigServiceTests.cs
index 65a239fa35..ec2fff9bc4 100644
--- a/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.UnitTests/Services/AppConfigServiceTests.cs
+++ b/tools/Azure.Mcp.Tools.AppConfig/tests/Azure.Mcp.Tools.AppConfig.UnitTests/Services/AppConfigServiceTests.cs
@@ -7,7 +7,6 @@
 
 namespace Azure.Mcp.Tools.AppConfig.UnitTests.Services;
 
-[Trait("Area", "AppConfig")]
 public class AppConfigServiceTests
 {
     /// <summary>
diff --git a/tools/Azure.Mcp.Tools.AppLens/tests/Azure.Mcp.Tools.AppLens.UnitTests/Resource/ResourceDiagnoseCommandTests.cs b/tools/Azure.Mcp.Tools.AppLens/tests/Azure.Mcp.Tools.AppLens.UnitTests/Resource/ResourceDiagnoseCommandTests.cs
index 0e77f7f4eb..dcc94eb2f7 100644
--- a/tools/Azure.Mcp.Tools.AppLens/tests/Azure.Mcp.Tools.AppLens.UnitTests/Resource/ResourceDiagnoseCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.AppLens/tests/Azure.Mcp.Tools.AppLens.UnitTests/Resource/ResourceDiagnoseCommandTests.cs
@@ -15,7 +15,6 @@
 
 namespace Azure.Mcp.Tools.AppLens.UnitTests.Resource;
 
-[Trait("Area", "AppLens")]
 public class ResourceDiagnoseCommandTests
 {
     private readonly IServiceProvider _serviceProvider;
diff --git a/tools/Azure.Mcp.Tools.AppService/tests/Azure.Mcp.Tools.AppService.LiveTests/Database/DatabaseAddCommandLiveTests.cs b/tools/Azure.Mcp.Tools.AppService/tests/Azure.Mcp.Tools.AppService.LiveTests/Database/DatabaseAddCommandLiveTests.cs
index eb59b2f956..1fd197b541 100644
--- a/tools/Azure.Mcp.Tools.AppService/tests/Azure.Mcp.Tools.AppService.LiveTests/Database/DatabaseAddCommandLiveTests.cs
+++ b/tools/Azure.Mcp.Tools.AppService/tests/Azure.Mcp.Tools.AppService.LiveTests/Database/DatabaseAddCommandLiveTests.cs
@@ -10,7 +10,6 @@
 
 namespace Azure.Mcp.Tools.AppService.LiveTests.Database;
 
-[Trait("Area", "AppService")]
 [Trait("Command", "DatabaseAddCommand")]
 public class DatabaseAddCommandLiveTests(ITestOutputHelper output) : CommandTestsBase(output)
 {
diff --git a/tools/Azure.Mcp.Tools.AppService/tests/Azure.Mcp.Tools.AppService.UnitTests/Commands/Database/DatabaseAddCommandTests.cs b/tools/Azure.Mcp.Tools.AppService/tests/Azure.Mcp.Tools.AppService.UnitTests/Commands/Database/DatabaseAddCommandTests.cs
index 2d15bd7d0b..07638fe9b0 100644
--- a/tools/Azure.Mcp.Tools.AppService/tests/Azure.Mcp.Tools.AppService.UnitTests/Commands/Database/DatabaseAddCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.AppService/tests/Azure.Mcp.Tools.AppService.UnitTests/Commands/Database/DatabaseAddCommandTests.cs
@@ -18,7 +18,6 @@
 
 namespace Azure.Mcp.Tools.AppService.UnitTests.Commands.Database;
 
-[Trait("Area", "AppService")]
 [Trait("Command", "DatabaseAdd")]
 public class DatabaseAddCommandTests
 {
diff --git a/tools/Azure.Mcp.Tools.Communication/tests/Azure.Mcp.Tools.Communication.LiveTests/CommunicationCommandTests.cs b/tools/Azure.Mcp.Tools.Communication/tests/Azure.Mcp.Tools.Communication.LiveTests/CommunicationCommandTests.cs
index bb2441cf0d..c57738a047 100644
--- a/tools/Azure.Mcp.Tools.Communication/tests/Azure.Mcp.Tools.Communication.LiveTests/CommunicationCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.Communication/tests/Azure.Mcp.Tools.Communication.LiveTests/CommunicationCommandTests.cs
@@ -11,7 +11,6 @@
 
 namespace Azure.Mcp.Tools.Communication.LiveTests;
 
-[Trait("Area", "Communication")]
 [Trait("Command", "SmsSendCommand")]
 public class CommunicationCommandTests : CommandTestsBase
 {
diff --git a/tools/Azure.Mcp.Tools.Communication/tests/Azure.Mcp.Tools.Communication.LiveTests/Email/EmailSendCommandLiveTests.cs b/tools/Azure.Mcp.Tools.Communication/tests/Azure.Mcp.Tools.Communication.LiveTests/Email/EmailSendCommandLiveTests.cs
index b4e568f19b..19ea9c9298 100644
--- a/tools/Azure.Mcp.Tools.Communication/tests/Azure.Mcp.Tools.Communication.LiveTests/Email/EmailSendCommandLiveTests.cs
+++ b/tools/Azure.Mcp.Tools.Communication/tests/Azure.Mcp.Tools.Communication.LiveTests/Email/EmailSendCommandLiveTests.cs
@@ -13,7 +13,6 @@
 
 namespace Azure.Mcp.Tools.Communication.LiveTests.Email;
 
-[Trait("Area", "Communication")]
 [Trait("Command", "EmailSendCommand")]
 public class EmailSendCommandLiveTests : CommandTestsBase
 {
diff --git a/tools/Azure.Mcp.Tools.Communication/tests/Azure.Mcp.Tools.Communication.UnitTests/Sms/SmsSendCommandTests.cs b/tools/Azure.Mcp.Tools.Communication/tests/Azure.Mcp.Tools.Communication.UnitTests/Sms/SmsSendCommandTests.cs
index 7afaabdb6f..78058e3092 100644
--- a/tools/Azure.Mcp.Tools.Communication/tests/Azure.Mcp.Tools.Communication.UnitTests/Sms/SmsSendCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.Communication/tests/Azure.Mcp.Tools.Communication.UnitTests/Sms/SmsSendCommandTests.cs
@@ -13,8 +13,6 @@
 
 namespace Azure.Mcp.Tools.Communication.UnitTests.Sms;
 
-[Trait("Area", "Communication")]
-[Trait("Category", "Unit")]
 public class SmsSendCommandTests
 {
     [Fact]
diff --git a/tools/Azure.Mcp.Tools.EventGrid/tests/Azure.Mcp.Tools.EventGrid.LiveTests/EventGridCommandTests.cs b/tools/Azure.Mcp.Tools.EventGrid/tests/Azure.Mcp.Tools.EventGrid.LiveTests/EventGridCommandTests.cs
index 53aa61045a..ffa01d1023 100644
--- a/tools/Azure.Mcp.Tools.EventGrid/tests/Azure.Mcp.Tools.EventGrid.LiveTests/EventGridCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.EventGrid/tests/Azure.Mcp.Tools.EventGrid.LiveTests/EventGridCommandTests.cs
@@ -8,8 +8,6 @@
 
 namespace Azure.Mcp.Tools.EventGrid.LiveTests;
 
-[Trait("Area", "EventGrid")]
-[Trait("Category", "Live")]
 public class EventGridCommandTests(ITestOutputHelper output)
     : CommandTestsBase(output)
 {
diff --git a/tools/Azure.Mcp.Tools.EventGrid/tests/Azure.Mcp.Tools.EventGrid.UnitTests/Events/EventsPublishCommandTests.cs b/tools/Azure.Mcp.Tools.EventGrid/tests/Azure.Mcp.Tools.EventGrid.UnitTests/Events/EventsPublishCommandTests.cs
index 60620bc582..bd15273671 100644
--- a/tools/Azure.Mcp.Tools.EventGrid/tests/Azure.Mcp.Tools.EventGrid.UnitTests/Events/EventsPublishCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.EventGrid/tests/Azure.Mcp.Tools.EventGrid.UnitTests/Events/EventsPublishCommandTests.cs
@@ -18,7 +18,6 @@
 
 namespace Azure.Mcp.Tools.EventGrid.UnitTests.Events;
 
-[Trait("Area", "EventGrid")]
 public class EventsPublishCommandTests
 {
     private readonly IServiceProvider _serviceProvider;
diff --git a/tools/Azure.Mcp.Tools.EventGrid/tests/Azure.Mcp.Tools.EventGrid.UnitTests/Subscription/SubscriptionListCommandTests.cs b/tools/Azure.Mcp.Tools.EventGrid/tests/Azure.Mcp.Tools.EventGrid.UnitTests/Subscription/SubscriptionListCommandTests.cs
index 460479bc44..fb7d640f13 100644
--- a/tools/Azure.Mcp.Tools.EventGrid/tests/Azure.Mcp.Tools.EventGrid.UnitTests/Subscription/SubscriptionListCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.EventGrid/tests/Azure.Mcp.Tools.EventGrid.UnitTests/Subscription/SubscriptionListCommandTests.cs
@@ -17,7 +17,6 @@
 
 namespace Azure.Mcp.Tools.EventGrid.UnitTests.Subscription;
 
-[Trait("Area", "EventGrid")]
 public class SubscriptionListCommandTests
 {
     private readonly IServiceProvider _serviceProvider;
diff --git a/tools/Azure.Mcp.Tools.EventGrid/tests/Azure.Mcp.Tools.EventGrid.UnitTests/Topic/TopicListCommandTests.cs b/tools/Azure.Mcp.Tools.EventGrid/tests/Azure.Mcp.Tools.EventGrid.UnitTests/Topic/TopicListCommandTests.cs
index e8b7e7e22f..b0de82ff8b 100644
--- a/tools/Azure.Mcp.Tools.EventGrid/tests/Azure.Mcp.Tools.EventGrid.UnitTests/Topic/TopicListCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.EventGrid/tests/Azure.Mcp.Tools.EventGrid.UnitTests/Topic/TopicListCommandTests.cs
@@ -17,7 +17,6 @@
 
 namespace Azure.Mcp.Tools.EventGrid.UnitTests.Topic;
 
-[Trait("Area", "EventGrid")]
 public class TopicListCommandTests
 {
     private readonly IServiceProvider _serviceProvider;
diff --git a/tools/Azure.Mcp.Tools.Foundry/tests/Azure.Mcp.Tools.Foundry.LiveTests/FoundryCommandTests.cs b/tools/Azure.Mcp.Tools.Foundry/tests/Azure.Mcp.Tools.Foundry.LiveTests/FoundryCommandTests.cs
index b46378d2d6..ecb66b6f2b 100644
--- a/tools/Azure.Mcp.Tools.Foundry/tests/Azure.Mcp.Tools.Foundry.LiveTests/FoundryCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.Foundry/tests/Azure.Mcp.Tools.Foundry.LiveTests/FoundryCommandTests.cs
@@ -426,7 +426,6 @@ public async Task Should_list_openai_models()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_create_agent()
     {
         var projectName = $"{Settings.ResourceBaseName}-ai-projects";
@@ -457,7 +456,6 @@ public async Task Should_create_agent()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_connect_agent()
     {
         var projectName = $"{Settings.ResourceBaseName}-ai-projects";
@@ -488,7 +486,6 @@ public async Task Should_connect_agent()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_list_agents()
     {
         var projectName = $"{Settings.ResourceBaseName}-ai-projects";
@@ -513,7 +510,6 @@ public async Task Should_list_agents()
     [InlineData("task_adherence", "Task Adherence")]
     [InlineData("tool_call_accuracy", "Tool Call Accuracy")]
     [InlineData("intent_resolution", "Intent Resolution")]
-    [Trait("Category", "Live")]
     public async Task Should_query_and_evaluate_agent(string evaluatorName, string evaluationMetric)
     {
         // to be filled in
@@ -565,7 +561,6 @@ public async Task Should_query_and_evaluate_agent(string evaluatorName, string e
     [InlineData("task_adherence", "Task Adherence")]
     [InlineData("tool_call_accuracy", "Tool Call Accuracy")]
     [InlineData("intent_resolution", "Intent Resolution")]
-    [Trait("Category", "Live")]
     public async Task Should_evaluate_agent(string evaluatorName, string evaluationMetric)
     {
         // to be filled in
@@ -1040,7 +1035,6 @@ public async Task Should_get_foundry_resource_using_static_resources()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_create_thread()
     {
         var projectName = $"{Settings.ResourceBaseName}-ai-projects";
@@ -1061,7 +1055,6 @@ public async Task Should_create_thread()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_list_threads()
     {
         var projectName = $"{Settings.ResourceBaseName}-ai-projects";
@@ -1078,7 +1071,6 @@ public async Task Should_list_threads()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_get_messages()
     {
         var projectName = $"{Settings.ResourceBaseName}-ai-projects";
diff --git a/tools/Azure.Mcp.Tools.Marketplace/tests/Azure.Mcp.Tools.Marketplace.LiveTests/ProductGetCommandTests.cs b/tools/Azure.Mcp.Tools.Marketplace/tests/Azure.Mcp.Tools.Marketplace.LiveTests/ProductGetCommandTests.cs
index 46a31279aa..81265475d7 100644
--- a/tools/Azure.Mcp.Tools.Marketplace/tests/Azure.Mcp.Tools.Marketplace.LiveTests/ProductGetCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.Marketplace/tests/Azure.Mcp.Tools.Marketplace.LiveTests/ProductGetCommandTests.cs
@@ -14,7 +14,6 @@
 
 namespace Azure.Mcp.Tools.Marketplace.LiveTests;
 
-[Trait("Area", "Marketplace")]
 public class ProductGetCommandTests : CommandTestsBase
 {
     private const string ProductKey = "product";
@@ -33,7 +32,6 @@ public ProductGetCommandTests(ITestOutputHelper output) : base(output)
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_get_marketplace_product()
     {
         var result = await CallToolAsync(
@@ -53,7 +51,6 @@ public async Task Should_get_marketplace_product()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_get_marketplace_product_with_language_option()
     {
         var result = await CallToolAsync(
@@ -74,7 +71,6 @@ public async Task Should_get_marketplace_product_with_language_option()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_get_marketplace_product_with_market_option()
     {
         var result = await CallToolAsync(
@@ -95,7 +91,6 @@ public async Task Should_get_marketplace_product_with_market_option()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_get_marketplace_product_with_multiple_options()
     {
         var result = await CallToolAsync(
diff --git a/tools/Azure.Mcp.Tools.Marketplace/tests/Azure.Mcp.Tools.Marketplace.LiveTests/ProductListCommandTests.cs b/tools/Azure.Mcp.Tools.Marketplace/tests/Azure.Mcp.Tools.Marketplace.LiveTests/ProductListCommandTests.cs
index 295f625b92..f93110e452 100644
--- a/tools/Azure.Mcp.Tools.Marketplace/tests/Azure.Mcp.Tools.Marketplace.LiveTests/ProductListCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.Marketplace/tests/Azure.Mcp.Tools.Marketplace.LiveTests/ProductListCommandTests.cs
@@ -14,7 +14,6 @@
 
 namespace Azure.Mcp.Tools.Marketplace.LiveTests;
 
-[Trait("Area", "Marketplace")]
 public class ProductListCommandTests : CommandTestsBase
 {
     private const string ProductsKey = "products";
@@ -31,7 +30,6 @@ public ProductListCommandTests(ITestOutputHelper output) : base(output)
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_list_marketplace_products()
     {
         var result = await CallToolAsync(
@@ -53,7 +51,6 @@ public async Task Should_list_marketplace_products()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_list_marketplace_products_with_language_option()
     {
         var result = await CallToolAsync(
@@ -73,7 +70,6 @@ public async Task Should_list_marketplace_products_with_language_option()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_list_marketplace_products_with_french_language_option()
     {
         var result = await CallToolAsync(
@@ -93,7 +89,6 @@ public async Task Should_list_marketplace_products_with_french_language_option()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_list_marketplace_products_with_language_and_search_options()
     {
         var result = await CallToolAsync(
@@ -115,7 +110,6 @@ public async Task Should_list_marketplace_products_with_language_and_search_opti
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_list_marketplace_products_with_search_option()
     {
         var result = await CallToolAsync(
@@ -136,7 +130,6 @@ public async Task Should_list_marketplace_products_with_search_option()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_list_marketplace_products_with_multiple_options()
     {
         var result = await CallToolAsync(
@@ -157,7 +150,6 @@ public async Task Should_list_marketplace_products_with_multiple_options()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_list_marketplace_products_with_filter_option()
     {
         var result = await CallToolAsync(
@@ -177,7 +169,6 @@ public async Task Should_list_marketplace_products_with_filter_option()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_list_marketplace_products_with_orderby_option()
     {
         var result = await CallToolAsync(
@@ -197,7 +188,6 @@ public async Task Should_list_marketplace_products_with_orderby_option()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_list_marketplace_products_with_select_option()
     {
         var result = await CallToolAsync(
@@ -222,7 +212,6 @@ public async Task Should_list_marketplace_products_with_select_option()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_list_marketplace_products_with_multiple_odata_options()
     {
         var result = await CallToolAsync(
diff --git a/tools/Azure.Mcp.Tools.Marketplace/tests/Azure.Mcp.Tools.Marketplace.UnitTests/Product/ProductGetCommandTests.cs b/tools/Azure.Mcp.Tools.Marketplace/tests/Azure.Mcp.Tools.Marketplace.UnitTests/Product/ProductGetCommandTests.cs
index 5844708843..f025534159 100644
--- a/tools/Azure.Mcp.Tools.Marketplace/tests/Azure.Mcp.Tools.Marketplace.UnitTests/Product/ProductGetCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.Marketplace/tests/Azure.Mcp.Tools.Marketplace.UnitTests/Product/ProductGetCommandTests.cs
@@ -16,7 +16,6 @@
 
 namespace Azure.Mcp.Tools.Marketplace.UnitTests.Product;
 
-[Trait("Area", "Marketplace")]
 public class ProductGetCommandTests
 {
     private readonly IServiceProvider _serviceProvider;
diff --git a/tools/Azure.Mcp.Tools.Marketplace/tests/Azure.Mcp.Tools.Marketplace.UnitTests/Product/ProductListCommandTests.cs b/tools/Azure.Mcp.Tools.Marketplace/tests/Azure.Mcp.Tools.Marketplace.UnitTests/Product/ProductListCommandTests.cs
index 2125842d2a..c42da4515b 100644
--- a/tools/Azure.Mcp.Tools.Marketplace/tests/Azure.Mcp.Tools.Marketplace.UnitTests/Product/ProductListCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.Marketplace/tests/Azure.Mcp.Tools.Marketplace.UnitTests/Product/ProductListCommandTests.cs
@@ -16,7 +16,6 @@
 
 namespace Azure.Mcp.Tools.Marketplace.UnitTests.Product;
 
-[Trait("Area", "Marketplace")]
 public class ProductListCommandTests
 {
     private readonly IServiceProvider _serviceProvider;
diff --git a/tools/Azure.Mcp.Tools.Monitor/tests/Azure.Mcp.Tools.Monitor.UnitTests/ActivityLog/ActivityLogListCommandTests.cs b/tools/Azure.Mcp.Tools.Monitor/tests/Azure.Mcp.Tools.Monitor.UnitTests/ActivityLog/ActivityLogListCommandTests.cs
index 09b15c1ce7..0c13c5e78d 100644
--- a/tools/Azure.Mcp.Tools.Monitor/tests/Azure.Mcp.Tools.Monitor.UnitTests/ActivityLog/ActivityLogListCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.Monitor/tests/Azure.Mcp.Tools.Monitor.UnitTests/ActivityLog/ActivityLogListCommandTests.cs
@@ -17,7 +17,6 @@
 
 namespace Azure.Mcp.Tools.Monitor.UnitTests.ActivityLog;
 
-[Trait("Area", "Monitor")]
 public sealed class ActivityLogListCommandTests
 {
     private readonly IServiceProvider _serviceProvider;
diff --git a/tools/Azure.Mcp.Tools.Monitor/tests/Azure.Mcp.Tools.Monitor.UnitTests/Log/ResourceLogQueryCommandTests.cs b/tools/Azure.Mcp.Tools.Monitor/tests/Azure.Mcp.Tools.Monitor.UnitTests/Log/ResourceLogQueryCommandTests.cs
index 936afd682d..dfe54efe9d 100644
--- a/tools/Azure.Mcp.Tools.Monitor/tests/Azure.Mcp.Tools.Monitor.UnitTests/Log/ResourceLogQueryCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.Monitor/tests/Azure.Mcp.Tools.Monitor.UnitTests/Log/ResourceLogQueryCommandTests.cs
@@ -15,7 +15,6 @@
 
 namespace Azure.Mcp.Tools.Monitor.UnitTests.Log;
 
-[Trait("Area", "Monitor")]
 public sealed class ResourceLogQueryCommandTests
 {
     private readonly IServiceProvider _serviceProvider;
diff --git a/tools/Azure.Mcp.Tools.Monitor/tests/Azure.Mcp.Tools.Monitor.UnitTests/Log/WorkspaceLogQueryCommandTests.cs b/tools/Azure.Mcp.Tools.Monitor/tests/Azure.Mcp.Tools.Monitor.UnitTests/Log/WorkspaceLogQueryCommandTests.cs
index afae5826dd..5a2ed14cfb 100644
--- a/tools/Azure.Mcp.Tools.Monitor/tests/Azure.Mcp.Tools.Monitor.UnitTests/Log/WorkspaceLogQueryCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.Monitor/tests/Azure.Mcp.Tools.Monitor.UnitTests/Log/WorkspaceLogQueryCommandTests.cs
@@ -15,7 +15,6 @@
 
 namespace Azure.Mcp.Tools.Monitor.UnitTests.Log;
 
-[Trait("Area", "Monitor")]
 public sealed class WorkspaceLogQueryCommandTests
 {
     private readonly IServiceProvider _serviceProvider;
diff --git a/tools/Azure.Mcp.Tools.Monitor/tests/Azure.Mcp.Tools.Monitor.UnitTests/Table/TableListCommandTests.cs b/tools/Azure.Mcp.Tools.Monitor/tests/Azure.Mcp.Tools.Monitor.UnitTests/Table/TableListCommandTests.cs
index 39f19fd1fd..7f97a6ab67 100644
--- a/tools/Azure.Mcp.Tools.Monitor/tests/Azure.Mcp.Tools.Monitor.UnitTests/Table/TableListCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.Monitor/tests/Azure.Mcp.Tools.Monitor.UnitTests/Table/TableListCommandTests.cs
@@ -16,7 +16,6 @@
 
 namespace Azure.Mcp.Tools.Monitor.UnitTests.Table;
 
-[Trait("Area", "Monitor")]
 public sealed class TableListCommandTests
 {
     private readonly IServiceProvider _serviceProvider;
diff --git a/tools/Azure.Mcp.Tools.Monitor/tests/Azure.Mcp.Tools.Monitor.UnitTests/TableType/TableTypeListCommandTests.cs b/tools/Azure.Mcp.Tools.Monitor/tests/Azure.Mcp.Tools.Monitor.UnitTests/TableType/TableTypeListCommandTests.cs
index c3d3f0027a..a7dbb1dd1b 100644
--- a/tools/Azure.Mcp.Tools.Monitor/tests/Azure.Mcp.Tools.Monitor.UnitTests/TableType/TableTypeListCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.Monitor/tests/Azure.Mcp.Tools.Monitor.UnitTests/TableType/TableTypeListCommandTests.cs
@@ -16,7 +16,6 @@
 
 namespace Azure.Mcp.Tools.Monitor.UnitTests.TableType;
 
-[Trait("Area", "Monitor")]
 public sealed class TableTypeListCommandTests
 {
     private readonly IServiceProvider _serviceProvider;
diff --git a/tools/Azure.Mcp.Tools.Monitor/tests/Azure.Mcp.Tools.Monitor.UnitTests/Workspace/WorkspaceListCommandTests.cs b/tools/Azure.Mcp.Tools.Monitor/tests/Azure.Mcp.Tools.Monitor.UnitTests/Workspace/WorkspaceListCommandTests.cs
index 44d3066443..1235d58255 100644
--- a/tools/Azure.Mcp.Tools.Monitor/tests/Azure.Mcp.Tools.Monitor.UnitTests/Workspace/WorkspaceListCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.Monitor/tests/Azure.Mcp.Tools.Monitor.UnitTests/Workspace/WorkspaceListCommandTests.cs
@@ -17,7 +17,6 @@
 
 namespace Azure.Mcp.Tools.Monitor.UnitTests.Workspace;
 
-[Trait("Area", "Monitor")]
 public sealed class WorkspaceListCommandTests
 {
     private readonly IServiceProvider _serviceProvider;
diff --git a/tools/Azure.Mcp.Tools.Quota/tests/Azure.Mcp.Tools.Quota.LiveTests/QuotaCommandTests.cs b/tools/Azure.Mcp.Tools.Quota/tests/Azure.Mcp.Tools.Quota.LiveTests/QuotaCommandTests.cs
index 51b8a41b8b..b37fbe3401 100644
--- a/tools/Azure.Mcp.Tools.Quota/tests/Azure.Mcp.Tools.Quota.LiveTests/QuotaCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.Quota/tests/Azure.Mcp.Tools.Quota.LiveTests/QuotaCommandTests.cs
@@ -8,7 +8,6 @@
 
 namespace Azure.Mcp.Tools.Quota.LiveTests;
 
-[Trait("Area", "Quota")]
 public class QuotaCommandTests : CommandTestsBase
 {
     public QuotaCommandTests(ITestOutputHelper output) : base(output)
@@ -16,7 +15,6 @@ public QuotaCommandTests(ITestOutputHelper output) : base(output)
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_check_azure_quota()
     {
         // act
@@ -65,7 +63,6 @@ public async Task Should_check_azure_quota()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_check_azure_regions()
     {
         // act
@@ -99,7 +96,6 @@ public async Task Should_check_azure_regions()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_check_regions_with_cognitive_services()
     {
         // act
diff --git a/tools/Azure.Mcp.Tools.Quota/tests/Azure.Mcp.Tools.Quota.UnitTests/Commands/Region/AvailabilityListCommandTests.cs b/tools/Azure.Mcp.Tools.Quota/tests/Azure.Mcp.Tools.Quota.UnitTests/Commands/Region/AvailabilityListCommandTests.cs
index e999f0d1db..e7b8916584 100644
--- a/tools/Azure.Mcp.Tools.Quota/tests/Azure.Mcp.Tools.Quota.UnitTests/Commands/Region/AvailabilityListCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.Quota/tests/Azure.Mcp.Tools.Quota.UnitTests/Commands/Region/AvailabilityListCommandTests.cs
@@ -16,7 +16,6 @@
 
 namespace Azure.Mcp.Tools.Quota.UnitTests.Commands.Region;
 
-[Trait("Area", "Quota")]
 public sealed class AvailabilityListCommandTests
 {
     private readonly IServiceProvider _serviceProvider;
diff --git a/tools/Azure.Mcp.Tools.Quota/tests/Azure.Mcp.Tools.Quota.UnitTests/Commands/Usage/CheckCommandTests.cs b/tools/Azure.Mcp.Tools.Quota/tests/Azure.Mcp.Tools.Quota.UnitTests/Commands/Usage/CheckCommandTests.cs
index 2cb40c032e..547a2ae206 100644
--- a/tools/Azure.Mcp.Tools.Quota/tests/Azure.Mcp.Tools.Quota.UnitTests/Commands/Usage/CheckCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.Quota/tests/Azure.Mcp.Tools.Quota.UnitTests/Commands/Usage/CheckCommandTests.cs
@@ -17,7 +17,6 @@
 
 namespace Azure.Mcp.Tools.Quota.UnitTests.Commands.Usage;
 
-[Trait("Area", "Quota")]
 public sealed class CheckCommandTests
 {
     private readonly IServiceProvider _serviceProvider;
diff --git a/tools/Azure.Mcp.Tools.ServiceBus/tests/Azure.Mcp.Tools.ServiceBus.UnitTests/Topic/SubscriptionDetailsCommandTests.cs b/tools/Azure.Mcp.Tools.ServiceBus/tests/Azure.Mcp.Tools.ServiceBus.UnitTests/Topic/SubscriptionDetailsCommandTests.cs
index 561adc8bb8..a452c89aad 100644
--- a/tools/Azure.Mcp.Tools.ServiceBus/tests/Azure.Mcp.Tools.ServiceBus.UnitTests/Topic/SubscriptionDetailsCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.ServiceBus/tests/Azure.Mcp.Tools.ServiceBus.UnitTests/Topic/SubscriptionDetailsCommandTests.cs
@@ -19,7 +19,6 @@
 
 namespace Azure.Mcp.Tools.ServiceBus.UnitTests.Topic;
 
-[Trait("Area", "ServiceBus")]
 public class SubscriptionDetailsCommandTests
 {
     private readonly IServiceProvider _serviceProvider;
diff --git a/tools/Azure.Mcp.Tools.Speech/tests/Azure.Mcp.Tools.Speech.LiveTests/SpeechCommandTests.cs b/tools/Azure.Mcp.Tools.Speech/tests/Azure.Mcp.Tools.Speech.LiveTests/SpeechCommandTests.cs
index 51855aa3ad..92c46029cc 100644
--- a/tools/Azure.Mcp.Tools.Speech/tests/Azure.Mcp.Tools.Speech.LiveTests/SpeechCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.Speech/tests/Azure.Mcp.Tools.Speech.LiveTests/SpeechCommandTests.cs
@@ -10,8 +10,6 @@
 
 namespace Azure.Mcp.Tools.Speech.LiveTests;
 
-[Trait("Toolset", "Speech")]
-[Trait("Category", "Live")]
 public class SpeechCommandTests(ITestOutputHelper output) : CommandTestsBase(output)
 {
     #region SpeechToText Tests
diff --git a/tools/Azure.Mcp.Tools.VirtualDesktop/tests/Azure.Mcp.Tools.VirtualDesktop.LiveTests/VirtualDesktopCommandTests.cs b/tools/Azure.Mcp.Tools.VirtualDesktop/tests/Azure.Mcp.Tools.VirtualDesktop.LiveTests/VirtualDesktopCommandTests.cs
index b51e6d3d6e..aa83135443 100644
--- a/tools/Azure.Mcp.Tools.VirtualDesktop/tests/Azure.Mcp.Tools.VirtualDesktop.LiveTests/VirtualDesktopCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.VirtualDesktop/tests/Azure.Mcp.Tools.VirtualDesktop.LiveTests/VirtualDesktopCommandTests.cs
@@ -8,11 +8,9 @@
 
 namespace Azure.Mcp.Tools.VirtualDesktop.LiveTests;
 
-[Trait("Area", "VirtualDesktop")]
 public class VirtualDesktopCommandTests(ITestOutputHelper output) : CommandTestsBase(output)
 {
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_ListHostpools_WithSubscriptionId()
     {
         var result = await CallToolAsync(
@@ -38,7 +36,6 @@ public async Task Should_ListHostpools_WithSubscriptionId()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_ListHostpools_WithSubscriptionName()
     {
         var result = await CallToolAsync(
@@ -64,7 +61,6 @@ public async Task Should_ListHostpools_WithSubscriptionName()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_ListHostpools_WithResourceGroup_WithSubscriptionId()
     {
         // First get all hostpools to find one with a resource group
@@ -108,7 +104,6 @@ public async Task Should_ListHostpools_WithResourceGroup_WithSubscriptionId()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_ListHostpools_WithResourceGroup_WithSubscriptionName()
     {
         // First get all hostpools to find one with a resource group
@@ -152,7 +147,6 @@ public async Task Should_ListHostpools_WithResourceGroup_WithSubscriptionName()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_ListHostpools_WithNonExistentResourceGroup()
     {
         // Test with a non-existent resource group name
@@ -170,7 +164,6 @@ public async Task Should_ListHostpools_WithNonExistentResourceGroup()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_ListSessionHosts_WithSubscriptionId()
     {
         // First get available hostpools
@@ -209,7 +202,6 @@ public async Task Should_ListSessionHosts_WithSubscriptionId()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_ListSessionHosts_WithSubscriptionName()
     {
         // First get available hostpools
@@ -248,7 +240,6 @@ public async Task Should_ListSessionHosts_WithSubscriptionName()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_ListUserSessions_WithSubscriptionId()
     {
         // First get available hostpools
@@ -307,7 +298,6 @@ public async Task Should_ListUserSessions_WithSubscriptionId()
     }
 
     [Fact]
-    [Trait("Category", "Live")]
     public async Task Should_ListUserSessions_WithSubscriptionName()
     {
         // First get available hostpools
diff --git a/tools/Azure.Mcp.Tools.VirtualDesktop/tests/Azure.Mcp.Tools.VirtualDesktop.UnitTests/Hostpool/HostpoolListCommandTests.cs b/tools/Azure.Mcp.Tools.VirtualDesktop/tests/Azure.Mcp.Tools.VirtualDesktop.UnitTests/Hostpool/HostpoolListCommandTests.cs
index 89e220155a..6c54fae694 100644
--- a/tools/Azure.Mcp.Tools.VirtualDesktop/tests/Azure.Mcp.Tools.VirtualDesktop.UnitTests/Hostpool/HostpoolListCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.VirtualDesktop/tests/Azure.Mcp.Tools.VirtualDesktop.UnitTests/Hostpool/HostpoolListCommandTests.cs
@@ -15,7 +15,6 @@
 
 namespace Azure.Mcp.Tools.VirtualDesktop.UnitTests.Hostpool;
 
-[Trait("Area", "VirtualDesktop")]
 public class HostpoolListCommandTests
 {
     private readonly IServiceProvider _serviceProvider;
diff --git a/tools/Azure.Mcp.Tools.VirtualDesktop/tests/Azure.Mcp.Tools.VirtualDesktop.UnitTests/SessionHost/SessionHostListCommandTests.cs b/tools/Azure.Mcp.Tools.VirtualDesktop/tests/Azure.Mcp.Tools.VirtualDesktop.UnitTests/SessionHost/SessionHostListCommandTests.cs
index a12d6899b2..03b6fe181d 100644
--- a/tools/Azure.Mcp.Tools.VirtualDesktop/tests/Azure.Mcp.Tools.VirtualDesktop.UnitTests/SessionHost/SessionHostListCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.VirtualDesktop/tests/Azure.Mcp.Tools.VirtualDesktop.UnitTests/SessionHost/SessionHostListCommandTests.cs
@@ -15,7 +15,6 @@
 
 namespace Azure.Mcp.Tools.VirtualDesktop.UnitTests.SessionHost;
 
-[Trait("Area", "VirtualDesktop")]
 public class SessionHostListCommandTests
 {
     private readonly IServiceProvider _serviceProvider;
diff --git a/tools/Azure.Mcp.Tools.VirtualDesktop/tests/Azure.Mcp.Tools.VirtualDesktop.UnitTests/SessionHost/SessionHostUserSessionListCommandTests.cs b/tools/Azure.Mcp.Tools.VirtualDesktop/tests/Azure.Mcp.Tools.VirtualDesktop.UnitTests/SessionHost/SessionHostUserSessionListCommandTests.cs
index 33e8c8f787..b77149e862 100644
--- a/tools/Azure.Mcp.Tools.VirtualDesktop/tests/Azure.Mcp.Tools.VirtualDesktop.UnitTests/SessionHost/SessionHostUserSessionListCommandTests.cs
+++ b/tools/Azure.Mcp.Tools.VirtualDesktop/tests/Azure.Mcp.Tools.VirtualDesktop.UnitTests/SessionHost/SessionHostUserSessionListCommandTests.cs
@@ -16,7 +16,6 @@
 
 namespace Azure.Mcp.Tools.VirtualDesktop.UnitTests.SessionHost;
 
-[Trait("Area", "VirtualDesktop")]
 public class SessionHostUserSessionListCommandTests
 {
     private readonly IServiceProvider _serviceProvider;