diff --git a/MediaBrowser.sln b/MediaBrowser.sln
index cf1bab11c6..50570deecf 100644
--- a/MediaBrowser.sln
+++ b/MediaBrowser.sln
@@ -58,7 +58,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jellyfin.Naming.Tests", "te
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jellyfin.Api.Tests", "tests\Jellyfin.Api.Tests\Jellyfin.Api.Tests.csproj", "{A2FD0A10-8F62-4F9D-B171-FFDF9F0AFA9D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emby.Server.Implementations.Tests", "tests\Emby.Server.Implementations.Tests\Emby.Server.Implementations.Tests.csproj", "{2E3A1B4B-4225-4AAA-8B29-0181A84E7AEE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jellyfin.Server.Implementations.Tests", "tests\Jellyfin.Server.Implementations.Tests\Jellyfin.Server.Implementations.Tests.csproj", "{2E3A1B4B-4225-4AAA-8B29-0181A84E7AEE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/tests/Emby.Server.Implementations.Tests/IO/ManagedFileSystemTests.cs b/tests/Jellyfin.Server.Implementations.Tests/IO/ManagedFileSystemTests.cs
similarity index 96%
rename from tests/Emby.Server.Implementations.Tests/IO/ManagedFileSystemTests.cs
rename to tests/Jellyfin.Server.Implementations.Tests/IO/ManagedFileSystemTests.cs
index 0044196a7f..f2a8e447fa 100644
--- a/tests/Emby.Server.Implementations.Tests/IO/ManagedFileSystemTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/IO/ManagedFileSystemTests.cs
@@ -3,7 +3,7 @@ using AutoFixture.AutoMoq;
 using Emby.Server.Implementations.IO;
 using Xunit;
 
-namespace Emby.Server.Implementations.Tests.IO
+namespace Jellyfin.Server.Implementations.Tests.IO
 {
     public class ManagedFileSystemTests
     {
diff --git a/tests/Emby.Server.Implementations.Tests/Emby.Server.Implementations.Tests.csproj b/tests/Jellyfin.Server.Implementations.Tests/Jellyfin.Server.Implementations.Tests.csproj
similarity index 91%
rename from tests/Emby.Server.Implementations.Tests/Emby.Server.Implementations.Tests.csproj
rename to tests/Jellyfin.Server.Implementations.Tests/Jellyfin.Server.Implementations.Tests.csproj
index c635a90f17..bb2afea168 100644
--- a/tests/Emby.Server.Implementations.Tests/Emby.Server.Implementations.Tests.csproj
+++ b/tests/Jellyfin.Server.Implementations.Tests/Jellyfin.Server.Implementations.Tests.csproj
@@ -4,6 +4,8 @@
         <TargetFramework>netcoreapp3.1</TargetFramework>
 
         <IsPackable>false</IsPackable>
+
+        <RootNamespace>Jellyfin.Server.Implementations.Tests</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>