diff --git a/dotnet/agent-framework-dotnet.slnx b/dotnet/agent-framework-dotnet.slnx
index 976a1c34fb..7cdde1eb35 100644
--- a/dotnet/agent-framework-dotnet.slnx
+++ b/dotnet/agent-framework-dotnet.slnx
@@ -279,7 +279,7 @@
     <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/Hosting.AgentThreadStore.IntegrationTests/Hosting.AgentThreadStore.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" />
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 9ec1800dea..9a4ab7b802 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="Hosting.AgentThreadStore.IntegrationTests" />
+    <InternalsVisibleTo Include="Microsoft.Agents.AI.Hosting.AzureStorage.Tests" />
   </ItemGroup>
 </Project>
diff --git a/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests/AzureBlobAgentThreadStoreTests.cs b/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests/AzureBlobAgentThreadStoreTests.cs
index 8b589657ac..b00a6a4f73 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests/AzureBlobAgentThreadStoreTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests/AzureBlobAgentThreadStoreTests.cs
@@ -8,7 +8,7 @@ using Microsoft.Agents.AI.Hosting.AzureStorage.Blob;
 using Microsoft.Extensions.AI;
 using Xunit.Abstractions;
 
-namespace Hosting.AgentThreadStore.IntegrationTests;
+namespace Microsoft.Agents.AI.Hosting.AzureStorage.Tests;
 
 /// <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.Tests/AzureStorageEmulatorAvailabilityHelper.cs
index e6eba54a87..92dd27216b 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests/AzureStorageEmulatorAvailabilityHelper.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests/AzureStorageEmulatorAvailabilityHelper.cs
@@ -7,7 +7,7 @@ using Azure;
 using Azure.Storage.Blobs;
 using Skip = Xunit.Skip;
 
-namespace Hosting.AgentThreadStore.IntegrationTests;
+namespace Microsoft.Agents.AI.Hosting.AzureStorage.Tests;
 
 /// <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/Mock/MockChatClient.cs b/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests/Mock/MockChatClient.cs
index 3c25eef6ee..8b25f92995 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests/Mock/MockChatClient.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests/Mock/MockChatClient.cs
@@ -8,7 +8,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.AI;
 
-namespace Hosting.AgentThreadStore.IntegrationTests.Mock;
+namespace Microsoft.Agents.AI.Hosting.AzureStorage.Tests.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.Tests/TestRunner.cs
index 73bf71fa83..a7a5349ac5 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests/TestRunner.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Hosting.AzureStorage.Tests/TestRunner.cs
@@ -4,14 +4,12 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Hosting.AgentThreadStore.IntegrationTests.Mock;
-using Microsoft.Agents.AI;
-using Microsoft.Agents.AI.Hosting;
+using Microsoft.Agents.AI.Hosting.AzureStorage.Tests.Mock;
 using Microsoft.Extensions.AI;
 using Xunit.Abstractions;
 using ThreadStore = Microsoft.Agents.AI.Hosting.AgentThreadStore;
 
-namespace Hosting.AgentThreadStore.IntegrationTests;
+namespace Microsoft.Agents.AI.Hosting.AzureStorage.Tests;
 
 internal sealed class TestRunner
 {