diff --git a/SchengenVisaApi/VisaApiTests/Database/InMemoryContextProvider.cs b/SchengenVisaApi/VisaApiTests/Tests/Infrastructure/Database/InMemoryContextProvider.cs
similarity index 93%
rename from SchengenVisaApi/VisaApiTests/Database/InMemoryContextProvider.cs
rename to SchengenVisaApi/VisaApiTests/Tests/Infrastructure/Database/InMemoryContextProvider.cs
index 90e805a..ec81a0f 100644
--- a/SchengenVisaApi/VisaApiTests/Database/InMemoryContextProvider.cs
+++ b/SchengenVisaApi/VisaApiTests/Tests/Infrastructure/Database/InMemoryContextProvider.cs
@@ -2,7 +2,7 @@
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using DbContext = Infrastructure.Database.DbContext;
 
-namespace VisaApi.Database
+namespace VisaApi.Tests.Infrastructure.Database
 {
     public static class InMemoryContextProvider
     {
diff --git a/SchengenVisaApi/VisaApiTests/Database/Repositories/ApplicantsRepositoryTests.cs b/SchengenVisaApi/VisaApiTests/Tests/Infrastructure/Database/Repositories/ApplicantsRepositoryTests.cs
similarity index 99%
rename from SchengenVisaApi/VisaApiTests/Database/Repositories/ApplicantsRepositoryTests.cs
rename to SchengenVisaApi/VisaApiTests/Tests/Infrastructure/Database/Repositories/ApplicantsRepositoryTests.cs
index c95a302..8cdd5a3 100644
--- a/SchengenVisaApi/VisaApiTests/Database/Repositories/ApplicantsRepositoryTests.cs
+++ b/SchengenVisaApi/VisaApiTests/Tests/Infrastructure/Database/Repositories/ApplicantsRepositoryTests.cs
@@ -9,7 +9,7 @@ using VisaApi.Fakers.Common;
 using VisaApi.Services;
 using Xunit;
 
-namespace VisaApi.Database.Repositories
+namespace VisaApi.Tests.Infrastructure.Database.Repositories
 {
     [Collection(Collections.ContextUsingTestCollection)]
     public class ApplicantsRepositoryTests
diff --git a/SchengenVisaApi/VisaApiTests/Database/Repositories/Generic/GenericRepositoryTests.cs b/SchengenVisaApi/VisaApiTests/Tests/Infrastructure/Database/Repositories/Generic/GenericRepositoryTests.cs
similarity index 97%
rename from SchengenVisaApi/VisaApiTests/Database/Repositories/Generic/GenericRepositoryTests.cs
rename to SchengenVisaApi/VisaApiTests/Tests/Infrastructure/Database/Repositories/Generic/GenericRepositoryTests.cs
index b7da95d..035bfc7 100644
--- a/SchengenVisaApi/VisaApiTests/Database/Repositories/Generic/GenericRepositoryTests.cs
+++ b/SchengenVisaApi/VisaApiTests/Tests/Infrastructure/Database/Repositories/Generic/GenericRepositoryTests.cs
@@ -5,7 +5,7 @@ using Infrastructure.Database;
 using Infrastructure.Database.Generic;
 using Xunit;
 
-namespace VisaApi.Database.Repositories.Generic;
+namespace VisaApi.Tests.Infrastructure.Database.Repositories.Generic;
 
 [Collection(Collections.ContextUsingTestCollection)]
 public class GenericRepositoryTests
diff --git a/SchengenVisaApi/VisaApiTests/Database/Repositories/Generic/TestGenericRepository.cs b/SchengenVisaApi/VisaApiTests/Tests/Infrastructure/Database/Repositories/Generic/TestGenericRepository.cs
similarity index 73%
rename from SchengenVisaApi/VisaApiTests/Database/Repositories/Generic/TestGenericRepository.cs
rename to SchengenVisaApi/VisaApiTests/Tests/Infrastructure/Database/Repositories/Generic/TestGenericRepository.cs
index c89a2e0..94842b8 100644
--- a/SchengenVisaApi/VisaApiTests/Database/Repositories/Generic/TestGenericRepository.cs
+++ b/SchengenVisaApi/VisaApiTests/Tests/Infrastructure/Database/Repositories/Generic/TestGenericRepository.cs
@@ -1,7 +1,7 @@
 using Domains.Users;
 using Infrastructure.Database.Generic;
 
-namespace VisaApi.Database.Repositories.Generic
+namespace VisaApi.Tests.Infrastructure.Database.Repositories.Generic
 {
     public class TestGenericRepository(IGenericReader reader, IGenericWriter writer) : GenericRepository<User>(reader, writer);
 }
diff --git a/SchengenVisaApi/VisaApiTests/Database/Repositories/UsersRepositoryTests.cs b/SchengenVisaApi/VisaApiTests/Tests/Infrastructure/Database/Repositories/UsersRepositoryTests.cs
similarity index 98%
rename from SchengenVisaApi/VisaApiTests/Database/Repositories/UsersRepositoryTests.cs
rename to SchengenVisaApi/VisaApiTests/Tests/Infrastructure/Database/Repositories/UsersRepositoryTests.cs
index 82ad536..834aa81 100644
--- a/SchengenVisaApi/VisaApiTests/Database/Repositories/UsersRepositoryTests.cs
+++ b/SchengenVisaApi/VisaApiTests/Tests/Infrastructure/Database/Repositories/UsersRepositoryTests.cs
@@ -7,7 +7,7 @@ using Infrastructure.Database.Users.Repositories;
 using VisaApi.Fakers.Common;
 using Xunit;
 
-namespace VisaApi.Database.Repositories
+namespace VisaApi.Tests.Infrastructure.Database.Repositories
 {
     [Collection(Collections.ContextUsingTestCollection)]
     public class UsersRepositoryTests
diff --git a/SchengenVisaApi/VisaApiTests/Database/Repositories/VisaApplicationsRepositoryTests.cs b/SchengenVisaApi/VisaApiTests/Tests/Infrastructure/Database/Repositories/VisaApplicationsRepositoryTests.cs
similarity index 99%
rename from SchengenVisaApi/VisaApiTests/Database/Repositories/VisaApplicationsRepositoryTests.cs
rename to SchengenVisaApi/VisaApiTests/Tests/Infrastructure/Database/Repositories/VisaApplicationsRepositoryTests.cs
index 2709178..d18db91 100644
--- a/SchengenVisaApi/VisaApiTests/Database/Repositories/VisaApplicationsRepositoryTests.cs
+++ b/SchengenVisaApi/VisaApiTests/Tests/Infrastructure/Database/Repositories/VisaApplicationsRepositoryTests.cs
@@ -11,7 +11,7 @@ using VisaApi.Fakers.VisaApplications;
 using VisaApi.Services;
 using Xunit;
 
-namespace VisaApi.Database.Repositories
+namespace VisaApi.Tests.Infrastructure.Database.Repositories
 {
     [Collection(Collections.ContextUsingTestCollection)]
     public class VisaApplicationsRepositoryTests
diff --git a/SchengenVisaApi/VisaApiTests/VisaApiTests.csproj b/SchengenVisaApi/VisaApiTests/VisaApiTests.csproj
index 9511b31..c58d98d 100644
--- a/SchengenVisaApi/VisaApiTests/VisaApiTests.csproj
+++ b/SchengenVisaApi/VisaApiTests/VisaApiTests.csproj
@@ -26,4 +26,8 @@
       <ProjectReference Include="..\SchengenVisaApi\SchengenVisaApi.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Folder Include="Tests\Infrastructure\" />
+    </ItemGroup>
+
 </Project>