diff --git a/src/Jackett.Test/Definitions/DefinitionsParserTests.cs b/src/Jackett.Test/Common/Definitions/DefinitionsParserTests.cs
similarity index 97%
rename from src/Jackett.Test/Definitions/DefinitionsParserTests.cs
rename to src/Jackett.Test/Common/Definitions/DefinitionsParserTests.cs
index cdd9d25cc..fe48db3b7 100644
--- a/src/Jackett.Test/Definitions/DefinitionsParserTests.cs
+++ b/src/Jackett.Test/Common/Definitions/DefinitionsParserTests.cs
@@ -7,7 +7,7 @@ using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
 using Assert = NUnit.Framework.Assert;
 
-namespace Jackett.Test.Definitions
+namespace Jackett.Test.Common.Definitions
 {
     [TestFixture]
     public class DefinitionsParserTests
diff --git a/src/Jackett.Test/Models/ResultPageTests.cs b/src/Jackett.Test/Common/Models/ResultPageTests.cs
similarity index 98%
rename from src/Jackett.Test/Models/ResultPageTests.cs
rename to src/Jackett.Test/Common/Models/ResultPageTests.cs
index 574313593..b763b2f9e 100644
--- a/src/Jackett.Test/Models/ResultPageTests.cs
+++ b/src/Jackett.Test/Common/Models/ResultPageTests.cs
@@ -8,7 +8,7 @@ using Newtonsoft.Json.Linq;
 using NUnit.Framework;
 using Assert = NUnit.Framework.Assert;
 
-namespace Jackett.Test.Models
+namespace Jackett.Test.Common.Models
 {
     class TestIndexer : BaseIndexer
     {
diff --git a/src/Jackett.Test/Utils/CookieUtilTests.cs b/src/Jackett.Test/Common/Utils/CookieUtilTests.cs
similarity index 99%
rename from src/Jackett.Test/Utils/CookieUtilTests.cs
rename to src/Jackett.Test/Common/Utils/CookieUtilTests.cs
index 41f178ac3..3f32b9371 100644
--- a/src/Jackett.Test/Utils/CookieUtilTests.cs
+++ b/src/Jackett.Test/Common/Utils/CookieUtilTests.cs
@@ -6,7 +6,7 @@ using NUnit.Framework;
 using Assert = NUnit.Framework.Assert;
 using CollectionAssert = NUnit.Framework.CollectionAssert;
 
-namespace Jackett.Test.Utils
+namespace Jackett.Test.Common.Utils
 {
     [TestFixture]
     public class CookieUtilTests
diff --git a/src/Jackett.Test/Utils/DateTimeUtilTests.cs b/src/Jackett.Test/Common/Utils/DateTimeUtilTests.cs
similarity index 94%
rename from src/Jackett.Test/Utils/DateTimeUtilTests.cs
rename to src/Jackett.Test/Common/Utils/DateTimeUtilTests.cs
index 183ed4117..00e9038d1 100644
--- a/src/Jackett.Test/Utils/DateTimeUtilTests.cs
+++ b/src/Jackett.Test/Common/Utils/DateTimeUtilTests.cs
@@ -1,8 +1,9 @@
 using System;
 using System.Collections.Generic;
+using Jackett.Common.Utils;
 using NUnit.Framework;
 
-namespace Jackett.Common.Utils.Tests
+namespace Jackett.Test.Common.Utils
 {
     [TestFixture]
     public class DateTimeUtilTests
diff --git a/src/Jackett.Test/Util/Invalid-RSS.xml b/src/Jackett.Test/Common/Utils/Invalid-RSS.xml
similarity index 100%
rename from src/Jackett.Test/Util/Invalid-RSS.xml
rename to src/Jackett.Test/Common/Utils/Invalid-RSS.xml
diff --git a/src/Jackett.Test/Util/ParseUtilTests.cs b/src/Jackett.Test/Common/Utils/ParseUtilTests.cs
similarity index 97%
rename from src/Jackett.Test/Util/ParseUtilTests.cs
rename to src/Jackett.Test/Common/Utils/ParseUtilTests.cs
index 1223cea24..07fb971b8 100644
--- a/src/Jackett.Test/Util/ParseUtilTests.cs
+++ b/src/Jackett.Test/Common/Utils/ParseUtilTests.cs
@@ -6,7 +6,7 @@ using FluentAssertions;
 using Jackett.Common.Utils;
 using NUnit.Framework;
 
-namespace Jackett.Test.Util
+namespace Jackett.Test.Common.Utils
 {
     [TestFixture]
     public class ParseUtilTests
diff --git a/src/Jackett.Test/Util/ServerUtilTests.cs b/src/Jackett.Test/Common/Utils/ServerUtilTests.cs
similarity index 97%
rename from src/Jackett.Test/Util/ServerUtilTests.cs
rename to src/Jackett.Test/Common/Utils/ServerUtilTests.cs
index 223a57924..045b84607 100644
--- a/src/Jackett.Test/Util/ServerUtilTests.cs
+++ b/src/Jackett.Test/Common/Utils/ServerUtilTests.cs
@@ -2,7 +2,7 @@ using Jackett.Common.Utils;
 using Jackett.Common.Utils.Clients;
 using NUnit.Framework;
 
-namespace Jackett.Test.Util
+namespace Jackett.Test.Common.Utils
 {
     [TestFixture]
     internal class ServerUtilTests : TestBase
diff --git a/src/Jackett.Test/Utils/StringUtilTests.cs b/src/Jackett.Test/Common/Utils/StringUtilTests.cs
similarity index 98%
rename from src/Jackett.Test/Utils/StringUtilTests.cs
rename to src/Jackett.Test/Common/Utils/StringUtilTests.cs
index 150eb42fa..3c913d434 100644
--- a/src/Jackett.Test/Utils/StringUtilTests.cs
+++ b/src/Jackett.Test/Common/Utils/StringUtilTests.cs
@@ -2,9 +2,10 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Text;
+using Jackett.Common.Utils;
 using NUnit.Framework;
 
-namespace Jackett.Common.Utils.Tests
+namespace Jackett.Test.Common.Utils
 {
     [TestFixture]
     public class StringUtilTests
diff --git a/src/Jackett.Test/Util/TvCategoryParserTests.cs b/src/Jackett.Test/Common/Utils/TvCategoryParserTests.cs
similarity index 96%
rename from src/Jackett.Test/Util/TvCategoryParserTests.cs
rename to src/Jackett.Test/Common/Utils/TvCategoryParserTests.cs
index 95c47a5d7..e55e0d5cb 100644
--- a/src/Jackett.Test/Util/TvCategoryParserTests.cs
+++ b/src/Jackett.Test/Common/Utils/TvCategoryParserTests.cs
@@ -1,7 +1,7 @@
 using Jackett.Common.Utils;
 using NUnit.Framework;
 
-namespace Jackett.Test.Util
+namespace Jackett.Test.Common.Utils
 {
     [TestFixture]
     internal class ParseTvShowQualityTest : TestBase
diff --git a/src/Jackett.Test/Jackett.Test.csproj b/src/Jackett.Test/Jackett.Test.csproj
index 2e04153af..2e2aa3b4e 100644
--- a/src/Jackett.Test/Jackett.Test.csproj
+++ b/src/Jackett.Test/Jackett.Test.csproj
@@ -10,15 +10,12 @@
   <ItemGroup>
     <Compile Remove="Indexers\**" />
     <EmbeddedResource Remove="Indexers\**" />
+    <EmbeddedResource Include="Common\Utils\Invalid-RSS.xml" />
     <None Remove="Indexers\**" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Remove="Util\Invalid-RSS.xml" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Util\Invalid-RSS.xml" />
+    <None Remove="Common\Utils\Invalid-RSS.xml" />
   </ItemGroup>
 
   <ItemGroup>
@@ -39,7 +36,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Folder Include="Common" />
     <Folder Include="Properties\" />
+    <Folder Include="Server" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Jackett.Test/Services/ProtectionServiceTests.cs b/src/Jackett.Test/Server/Services/ProtectionServiceTests.cs
similarity index 89%
rename from src/Jackett.Test/Services/ProtectionServiceTests.cs
rename to src/Jackett.Test/Server/Services/ProtectionServiceTests.cs
index f30f9639f..35c5f53c7 100644
--- a/src/Jackett.Test/Services/ProtectionServiceTests.cs
+++ b/src/Jackett.Test/Server/Services/ProtectionServiceTests.cs
@@ -3,19 +3,18 @@ using Jackett.Common.Models.Config;
 using Jackett.Common.Services.Interfaces;
 using NUnit.Framework;
 
-namespace Jackett.Test.Services
+namespace Jackett.Test.Server.Services
 {
     [TestFixture]
     internal class ProtectionServiceTests : TestBase
     {
-
         [Test]
         public void Should_be_able_to_encrypt_and_decrypt()
         {
             var ss = TestUtil.Container.Resolve<ServerConfig>();
             ss.InstanceId = "12345678";
             var ps = TestUtil.Container.Resolve<IProtectionService>();
-            var input = "test123";
+            const string input = "test123";
             var protectedInput = ps.Protect(input);
             var output = ps.UnProtect(protectedInput);