diff --git a/dotnet/agent-framework-dotnet.slnx b/dotnet/agent-framework-dotnet.slnx
index 7cdde1eb35..656efe4e9f 100644
--- a/dotnet/agent-framework-dotnet.slnx
+++ b/dotnet/agent-framework-dotnet.slnx
@@ -279,7 +279,6 @@
     <Project Path="tests/AgentConformance.IntegrationTests/AgentConformance.IntegrationTests.csproj" />
     <Project Path="tests/AzureAIAgentsPersistent.IntegrationTests/AzureAIAgentsPersistent.IntegrationTests.csproj" />
     <Project Path="tests/CopilotStudio.IntegrationTests/CopilotStudio.IntegrationTests.csproj" />
-    <Project Path="tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Mem0.IntegrationTests/Microsoft.Agents.AI.Mem0.IntegrationTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests/Microsoft.Agents.AI.Workflows.Declarative.IntegrationTests.csproj" />
     <Project Path="tests/OpenAIAssistant.IntegrationTests/OpenAIAssistant.IntegrationTests.csproj" />
@@ -292,6 +291,7 @@
     <Project Path="tests/Microsoft.Agents.AI.AzureAI.UnitTests/Microsoft.Agents.AI.AzureAI.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Hosting.A2A.Tests/Microsoft.Agents.AI.Hosting.A2A.Tests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Hosting.OpenAI.UnitTests/Microsoft.Agents.AI.Hosting.OpenAI.UnitTests.csproj" />
+    <Project Path="tests/Microsoft.Agents.AI.Hosting.AzureStorage.UnitTests/Microsoft.Agents.AI.Hosting.AzureStorage.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Hosting.UnitTests/Microsoft.Agents.AI.Hosting.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.Mem0.UnitTests/Microsoft.Agents.AI.Mem0.UnitTests.csproj" />
     <Project Path="tests/Microsoft.Agents.AI.OpenAI.UnitTests/Microsoft.Agents.AI.OpenAI.UnitTests.csproj" />
diff --git a/dotnet/src/Microsoft.Agents.AI.Hosting.AzureStorage/Microsoft.Agents.AI.Hosting.AzureStorage.csproj b/dotnet/src/Microsoft.Agents.AI.Hosting.AzureStorage/Microsoft.Agents.AI.Hosting.AzureStorage.csproj
index 9a4ab7b802..7944a6fb13 100644
--- a/dotnet/src/Microsoft.Agents.AI.Hosting.AzureStorage/Microsoft.Agents.AI.Hosting.AzureStorage.csproj
+++ b/dotnet/src/Microsoft.Agents.AI.Hosting.AzureStorage/Microsoft.Agents.AI.Hosting.AzureStorage.csproj
@@ -22,6 +22,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <InternalsVisibleTo Include="Microsoft.Agents.AI.Hosting.AzureStorage.Tests" />
+    <InternalsVisibleTo Include="Microsoft.Agents.AI.Hosting.AzureStorage.UnitTests" />
   </ItemGroup>
 </Project>
diff --git a/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests/AzureBlobAgentThreadStoreTests.cs b/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.UnitTests/AzureBlobAgentThreadStoreTests.cs
similarity index 98%
rename from dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests/AzureBlobAgentThreadStoreTests.cs
rename to dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.UnitTests/AzureBlobAgentThreadStoreTests.cs
index b00a6a4f73..cda485e6dc 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests/AzureBlobAgentThreadStoreTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.UnitTests/AzureBlobAgentThreadStoreTests.cs
@@ -8,7 +8,7 @@ using Microsoft.Agents.AI.Hosting.AzureStorage.Blob;
 using Microsoft.Extensions.AI;
 using Xunit.Abstractions;
 
-namespace Microsoft.Agents.AI.Hosting.AzureStorage.Tests;
+namespace Microsoft.Agents.AI.Hosting.AzureStorage.UnitTests;
 
 /// <summary>
 /// Tests for <see cref="AzureBlobAgentThreadStore"/>.
diff --git a/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests/AzureStorageEmulatorAvailabilityHelper.cs b/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.UnitTests/AzureStorageEmulatorAvailabilityHelper.cs
similarity index 96%
rename from dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests/AzureStorageEmulatorAvailabilityHelper.cs
rename to dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.UnitTests/AzureStorageEmulatorAvailabilityHelper.cs
index 92dd27216b..906acfd083 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests/AzureStorageEmulatorAvailabilityHelper.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.UnitTests/AzureStorageEmulatorAvailabilityHelper.cs
@@ -7,7 +7,7 @@ using Azure;
 using Azure.Storage.Blobs;
 using Skip = Xunit.Skip;
 
-namespace Microsoft.Agents.AI.Hosting.AzureStorage.Tests;
+namespace Microsoft.Agents.AI.Hosting.AzureStorage.UnitTests;
 
 /// <summary>
 /// Helper class to check if Azurite (Azure Storage Emulator) is available and running.
diff --git a/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests.csproj b/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.UnitTests/Microsoft.Agents.AI.Hosting.AzureStorage.UnitTests.csproj
similarity index 100%
rename from dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests.csproj
rename to dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.UnitTests/Microsoft.Agents.AI.Hosting.AzureStorage.UnitTests.csproj
diff --git a/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests/Mock/MockChatClient.cs b/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.UnitTests/Mock/MockChatClient.cs
similarity index 96%
rename from dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests/Mock/MockChatClient.cs
rename to dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.UnitTests/Mock/MockChatClient.cs
index 8b25f92995..e18c7d0633 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests/Mock/MockChatClient.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.UnitTests/Mock/MockChatClient.cs
@@ -8,7 +8,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.AI;
 
-namespace Microsoft.Agents.AI.Hosting.AzureStorage.Tests.Mock;
+namespace Microsoft.Agents.AI.Hosting.AzureStorage.UnitTests.Mock;
 
 internal sealed class MockChatClient : IChatClient
 {
diff --git a/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests/TestRunner.cs b/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.UnitTests/TestRunner.cs
similarity index 95%
rename from dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests/TestRunner.cs
rename to dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.UnitTests/TestRunner.cs
index a7a5349ac5..8e13c20015 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests/TestRunner.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.UnitTests/TestRunner.cs
@@ -4,12 +4,12 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.Agents.AI.Hosting.AzureStorage.Tests.Mock;
+using Microsoft.Agents.AI.Hosting.AzureStorage.UnitTests.Mock;
 using Microsoft.Extensions.AI;
 using Xunit.Abstractions;
 using ThreadStore = Microsoft.Agents.AI.Hosting.AgentThreadStore;
 
-namespace Microsoft.Agents.AI.Hosting.AzureStorage.Tests;
+namespace Microsoft.Agents.AI.Hosting.AzureStorage.UnitTests;
 
 internal sealed class TestRunner
 {