diff --git a/tests/Jellyfin.Api.Tests/Jellyfin.Api.Tests.csproj b/tests/Jellyfin.Api.Tests/Jellyfin.Api.Tests.csproj
index e3577caeee..806e4ea1d0 100644
--- a/tests/Jellyfin.Api.Tests/Jellyfin.Api.Tests.csproj
+++ b/tests/Jellyfin.Api.Tests/Jellyfin.Api.Tests.csproj
@@ -36,8 +36,7 @@
 
   <ItemGroup>
     <ProjectReference Include="../../Jellyfin.Api/Jellyfin.Api.csproj" />
-    <ProjectReference Include="../../Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj" />
-    <ProjectReference Include="..\Jellyfin.Server.Integration.Tests\Jellyfin.Server.Integration.Tests.csproj" />
+    <ProjectReference Include="../../Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj" />    
   </ItemGroup>
 
 </Project>
diff --git a/Jellyfin.Api/Controllers/TestsController.cs b/tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs
similarity index 87%
rename from Jellyfin.Api/Controllers/TestsController.cs
rename to tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs
index 1d1e1899fd..98ea00de6a 100644
--- a/Jellyfin.Api/Controllers/TestsController.cs
+++ b/tests/Jellyfin.Server.Integration.Tests/Controllers/EncoderController.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Jellyfin.Api.Constants;
 using Microsoft.AspNetCore.Authorization;
@@ -8,9 +8,9 @@ using Microsoft.AspNetCore.Mvc;
 namespace Jellyfin.Api.Controllers
 {
     /// <summary>
-    /// Controller for testing.
+    /// Controller for testing the encoded url.
     /// </summary>
-    public class TestsController : BaseJellyfinApiController
+    public class EncoderController : BaseJellyfinApiController
     {
         /// <summary>
         /// Tests the url decoding.
diff --git a/tests/Jellyfin.Server.Integration.Tests/EncodedQueryStringTest.cs b/tests/Jellyfin.Server.Integration.Tests/EncodedQueryStringTest.cs
index 0d1e408c85..29d3fe33d0 100644
--- a/tests/Jellyfin.Server.Integration.Tests/EncodedQueryStringTest.cs
+++ b/tests/Jellyfin.Server.Integration.Tests/EncodedQueryStringTest.cs
@@ -24,7 +24,7 @@ namespace Jellyfin.Server.Integration.Tests
         {
             var client = _factory.CreateClient();
 
-            var response = await client.GetAsync("Tests/UrlDecode?" + sourceUrl).ConfigureAwait(false);
+            var response = await client.GetAsync("Encoder/UrlDecode?" + sourceUrl).ConfigureAwait(false);
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
             string reply = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
             Assert.Equal(unencodedUrl, reply);