diff --git a/Govor.API.Tests/Govor.API.Tests.csproj b/Govor.API.Tests/Govor.API.Tests.csproj
index 2ef9646..b74c1ac 100644
--- a/Govor.API.Tests/Govor.API.Tests.csproj
+++ b/Govor.API.Tests/Govor.API.Tests.csproj
@@ -27,4 +27,8 @@
         <ProjectReference Include="..\Govor.API\Govor.API.csproj" />
         <ProjectReference Include="..\Govor.Data\Govor.Data.csproj" />
     </ItemGroup>
+
+    <ItemGroup>
+      <Folder Include="IntegrationTests\EF\Repositories\" />
+    </ItemGroup>
 </Project>
diff --git a/Govor.Data.Tests/Govor.Data.Tests.csproj b/Govor.Data.Tests/Govor.Data.Tests.csproj
new file mode 100644
index 0000000..812ca35
--- /dev/null
+++ b/Govor.Data.Tests/Govor.Data.Tests.csproj
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net9.0</TargetFramework>
+        <LangVersion>latest</LangVersion>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <IsPackable>false</IsPackable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="AutoFixture" Version="5.0.0-preview0012" />
+        <PackageReference Include="coverlet.collector" Version="6.0.2"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.6" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0"/>
+        <PackageReference Include="NUnit" Version="4.2.2"/>
+        <PackageReference Include="NUnit.Analyzers" Version="4.4.0"/>
+        <PackageReference Include="NUnit3TestAdapter" Version="4.6.0"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <Using Include="NUnit.Framework"/>
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Govor.Data\Govor.Data.csproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/Govor.API.Tests/IntegrationTests/EF/Repositories/AdminsRepositoryTests.cs b/Govor.Data.Tests/Repositories/AdminsRepositoryTests.cs
similarity index 98%
rename from Govor.API.Tests/IntegrationTests/EF/Repositories/AdminsRepositoryTests.cs
rename to Govor.Data.Tests/Repositories/AdminsRepositoryTests.cs
index 0790904..ed6b383 100644
--- a/Govor.API.Tests/IntegrationTests/EF/Repositories/AdminsRepositoryTests.cs
+++ b/Govor.Data.Tests/Repositories/AdminsRepositoryTests.cs
@@ -5,9 +5,8 @@ using Govor.Data;
 using Govor.Data.Repositories;
 using Govor.Data.Repositories.Exceptions;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
 
-namespace Govor.API.Tests.IntegrationTests.EF.Repositories;
+namespace Govor.Data.Tests.Repositories;
 
 [TestFixture]
 public class AdminsRepositoryTests
diff --git a/Govor.API.Tests/IntegrationTests/EF/Repositories/FriendshipsRepositoryTests.cs b/Govor.Data.Tests/Repositories/FriendshipsRepositoryTests.cs
similarity index 99%
rename from Govor.API.Tests/IntegrationTests/EF/Repositories/FriendshipsRepositoryTests.cs
rename to Govor.Data.Tests/Repositories/FriendshipsRepositoryTests.cs
index 6394447..8b0a905 100644
--- a/Govor.API.Tests/IntegrationTests/EF/Repositories/FriendshipsRepositoryTests.cs
+++ b/Govor.Data.Tests/Repositories/FriendshipsRepositoryTests.cs
@@ -6,7 +6,7 @@ using Govor.Data.Repositories;
 using Govor.Data.Repositories.Exceptions;
 using Microsoft.EntityFrameworkCore;
 
-namespace Govor.API.Tests.IntegrationTests.EF.Repositories;
+namespace Govor.Data.Tests.Repositories;
 
 [TestFixture]
 public class FriendshipsRepositoryTests
diff --git a/Govor.API.Tests/IntegrationTests/EF/Repositories/GroupRepositoryTests.cs b/Govor.Data.Tests/Repositories/GroupRepositoryTests.cs
similarity index 99%
rename from Govor.API.Tests/IntegrationTests/EF/Repositories/GroupRepositoryTests.cs
rename to Govor.Data.Tests/Repositories/GroupRepositoryTests.cs
index 3fac8c6..35fb5d3 100644
--- a/Govor.API.Tests/IntegrationTests/EF/Repositories/GroupRepositoryTests.cs
+++ b/Govor.Data.Tests/Repositories/GroupRepositoryTests.cs
@@ -6,7 +6,7 @@ using Govor.Data.Repositories;
 using Govor.Data.Repositories.Exceptions;
 using Microsoft.EntityFrameworkCore;
 
-namespace Govor.API.Tests.IntegrationTests.EF.Repositories;
+namespace Govor.Data.Tests.Repositories;
 
 [TestFixture]
 public class GroupRepositoryTests
diff --git a/Govor.API.Tests/IntegrationTests/EF/Repositories/InvitesRepositoryTests.cs b/Govor.Data.Tests/Repositories/InvitesRepositoryTests.cs
similarity index 99%
rename from Govor.API.Tests/IntegrationTests/EF/Repositories/InvitesRepositoryTests.cs
rename to Govor.Data.Tests/Repositories/InvitesRepositoryTests.cs
index a9569e7..413d23f 100644
--- a/Govor.API.Tests/IntegrationTests/EF/Repositories/InvitesRepositoryTests.cs
+++ b/Govor.Data.Tests/Repositories/InvitesRepositoryTests.cs
@@ -6,7 +6,7 @@ using Govor.Data.Repositories;
 using Govor.Data.Repositories.Exceptions;
 using Microsoft.EntityFrameworkCore;
 
-namespace Govor.API.Tests.IntegrationTests.EF.Repositories;
+namespace Govor.Data.Tests.Repositories;
 
 [TestFixture]
 public class InvitesRepositoryTests
diff --git a/Govor.API.Tests/IntegrationTests/EF/Repositories/MediaAttachmentsTests.cs b/Govor.Data.Tests/Repositories/MediaAttachmentsTests.cs
similarity index 99%
rename from Govor.API.Tests/IntegrationTests/EF/Repositories/MediaAttachmentsTests.cs
rename to Govor.Data.Tests/Repositories/MediaAttachmentsTests.cs
index bea247f..54331a6 100644
--- a/Govor.API.Tests/IntegrationTests/EF/Repositories/MediaAttachmentsTests.cs
+++ b/Govor.Data.Tests/Repositories/MediaAttachmentsTests.cs
@@ -6,7 +6,7 @@ using Govor.Data.Repositories;
 using Govor.Data.Repositories.Exceptions;
 using Microsoft.EntityFrameworkCore;
 
-namespace Govor.API.Tests.IntegrationTests.EF.Repositories;
+namespace Govor.Data.Tests.Repositories;
 
 [TestFixture]
 public class MediaAttachmentsTests
diff --git a/Govor.API.Tests/IntegrationTests/EF/Repositories/MessagesRepositoryTests.cs b/Govor.Data.Tests/Repositories/MessagesRepositoryTests.cs
similarity index 99%
rename from Govor.API.Tests/IntegrationTests/EF/Repositories/MessagesRepositoryTests.cs
rename to Govor.Data.Tests/Repositories/MessagesRepositoryTests.cs
index 9b12459..e0f60e2 100644
--- a/Govor.API.Tests/IntegrationTests/EF/Repositories/MessagesRepositoryTests.cs
+++ b/Govor.Data.Tests/Repositories/MessagesRepositoryTests.cs
@@ -6,7 +6,7 @@ using Govor.Data.Repositories;
 using Govor.Data.Repositories.Exceptions;
 using Microsoft.EntityFrameworkCore;
 
-namespace Govor.API.Tests.IntegrationTests.EF.Repositories;
+namespace Govor.Data.Tests.Repositories;
 
 [TestFixture]
 public class MessagesRepositoryTests
diff --git a/Govor.API.Tests/IntegrationTests/EF/Repositories/PrivateChatsRepositoryTests.cs b/Govor.Data.Tests/Repositories/PrivateChatsRepositoryTests.cs
similarity index 99%
rename from Govor.API.Tests/IntegrationTests/EF/Repositories/PrivateChatsRepositoryTests.cs
rename to Govor.Data.Tests/Repositories/PrivateChatsRepositoryTests.cs
index 387beff..7e26ff4 100644
--- a/Govor.API.Tests/IntegrationTests/EF/Repositories/PrivateChatsRepositoryTests.cs
+++ b/Govor.Data.Tests/Repositories/PrivateChatsRepositoryTests.cs
@@ -6,7 +6,7 @@ using Govor.Data.Repositories;
 using Govor.Data.Repositories.Exceptions;
 using Microsoft.EntityFrameworkCore;
 
-namespace Govor.API.Tests.IntegrationTests.EF.Repositories;
+namespace Govor.Data.Tests.Repositories;
 
 [TestFixture]
 public class PrivateChatsRepositoryTests
diff --git a/Govor.API.Tests/IntegrationTests/EF/Repositories/UsersRepositoryTests.cs b/Govor.Data.Tests/Repositories/UsersRepositoryTests.cs
similarity index 99%
rename from Govor.API.Tests/IntegrationTests/EF/Repositories/UsersRepositoryTests.cs
rename to Govor.Data.Tests/Repositories/UsersRepositoryTests.cs
index 7cec3bf..6080460 100644
--- a/Govor.API.Tests/IntegrationTests/EF/Repositories/UsersRepositoryTests.cs
+++ b/Govor.Data.Tests/Repositories/UsersRepositoryTests.cs
@@ -6,7 +6,7 @@ using Govor.Data.Repositories;
 using Govor.Data.Repositories.Exceptions;
 using Microsoft.EntityFrameworkCore;
 
-namespace Govor.API.Tests.IntegrationTests.EF.Repositories;
+namespace Govor.Data.Tests.Repositories;
 
 [TestFixture]
 public class UsersRepositoryTests
diff --git a/Govor.sln b/Govor.sln
index 8c4b6c7..0aec0ab 100644
--- a/Govor.sln
+++ b/Govor.sln
@@ -23,6 +23,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Govor.Application", "Govor.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Govor.Application.Tests", "Govor.Application.Tests\Govor.Application.Tests.csproj", "{F56A64DF-2938-4BE0-83F2-B86429F19259}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Govor.Data.Tests", "Govor.Data.Tests\Govor.Data.Tests.csproj", "{CF6B23EC-932A-4998-BA95-C94CAB7B092C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -61,6 +63,10 @@ Global
 		{F56A64DF-2938-4BE0-83F2-B86429F19259}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F56A64DF-2938-4BE0-83F2-B86429F19259}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F56A64DF-2938-4BE0-83F2-B86429F19259}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CF6B23EC-932A-4998-BA95-C94CAB7B092C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF6B23EC-932A-4998-BA95-C94CAB7B092C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF6B23EC-932A-4998-BA95-C94CAB7B092C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CF6B23EC-932A-4998-BA95-C94CAB7B092C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{15031CBD-F319-4755-BA91-B86F20BD8E37} = {4ED5259A-6FB4-4D89-8E6B-4778DC68F7D4}
@@ -71,5 +77,6 @@ Global
 		{4E94907F-BE20-42A6-AB15-637850FEAD11} = {114F53C1-B0AB-4BA0-9E36-0E811D1B3776}
 		{FC5EDCA8-FD58-4078-8FB1-2BDBB2F6CA3E} = {114F53C1-B0AB-4BA0-9E36-0E811D1B3776}
 		{F56A64DF-2938-4BE0-83F2-B86429F19259} = {4ED5259A-6FB4-4D89-8E6B-4778DC68F7D4}
+		{CF6B23EC-932A-4998-BA95-C94CAB7B092C} = {4ED5259A-6FB4-4D89-8E6B-4778DC68F7D4}
 	EndGlobalSection
 EndGlobal