diff --git a/MediaBrowser.sln b/MediaBrowser.sln
index 6d90098035..bf48e89518 100644
--- a/MediaBrowser.sln
+++ b/MediaBrowser.sln
@@ -78,6 +78,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jellyfin.Drawing.ImageMagic
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jellyfin.Drawing.Skia.Test", "tests\Jellyfin.Drawing.Skia.Test\Jellyfin.Drawing.Skia.Test.csproj", "{941A0327-CBE9-4804-BD45-49C0D4889E2D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jellyfin.Naming.Test", "tests\Jellyfin.Naming.Test\Jellyfin.Naming.Test.csproj", "{B1577537-4675-40CA-B6F4-699E544E5238}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -659,6 +661,26 @@ Global
 		{941A0327-CBE9-4804-BD45-49C0D4889E2D}.Release|x64.Build.0 = Release|Any CPU
 		{941A0327-CBE9-4804-BD45-49C0D4889E2D}.Release|x86.ActiveCfg = Release|Any CPU
 		{941A0327-CBE9-4804-BD45-49C0D4889E2D}.Release|x86.Build.0 = Release|Any CPU
+		{B1577537-4675-40CA-B6F4-699E544E5238}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1577537-4675-40CA-B6F4-699E544E5238}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1577537-4675-40CA-B6F4-699E544E5238}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B1577537-4675-40CA-B6F4-699E544E5238}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B1577537-4675-40CA-B6F4-699E544E5238}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{B1577537-4675-40CA-B6F4-699E544E5238}.Debug|Win32.Build.0 = Debug|Any CPU
+		{B1577537-4675-40CA-B6F4-699E544E5238}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B1577537-4675-40CA-B6F4-699E544E5238}.Debug|x64.Build.0 = Debug|Any CPU
+		{B1577537-4675-40CA-B6F4-699E544E5238}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B1577537-4675-40CA-B6F4-699E544E5238}.Debug|x86.Build.0 = Debug|Any CPU
+		{B1577537-4675-40CA-B6F4-699E544E5238}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1577537-4675-40CA-B6F4-699E544E5238}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1577537-4675-40CA-B6F4-699E544E5238}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B1577537-4675-40CA-B6F4-699E544E5238}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B1577537-4675-40CA-B6F4-699E544E5238}.Release|Win32.ActiveCfg = Release|Any CPU
+		{B1577537-4675-40CA-B6F4-699E544E5238}.Release|Win32.Build.0 = Release|Any CPU
+		{B1577537-4675-40CA-B6F4-699E544E5238}.Release|x64.ActiveCfg = Release|Any CPU
+		{B1577537-4675-40CA-B6F4-699E544E5238}.Release|x64.Build.0 = Release|Any CPU
+		{B1577537-4675-40CA-B6F4-699E544E5238}.Release|x86.ActiveCfg = Release|Any CPU
+		{B1577537-4675-40CA-B6F4-699E544E5238}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -673,5 +695,6 @@ Global
 		{DB1A8734-E61E-4DC8-9664-681E691DDD2C} = {2AC30C72-9249-4621-967C-929ECA51D9F2}
 		{D290F8B9-5C8C-4B11-82A7-E1F1615771B6} = {2AC30C72-9249-4621-967C-929ECA51D9F2}
 		{941A0327-CBE9-4804-BD45-49C0D4889E2D} = {2AC30C72-9249-4621-967C-929ECA51D9F2}
+		{B1577537-4675-40CA-B6F4-699E544E5238} = {2AC30C72-9249-4621-967C-929ECA51D9F2}
 	EndGlobalSection
 EndGlobal
diff --git a/tests/Jellyfin.Naming.Test/Jellyfin.Naming.Test.csproj b/tests/Jellyfin.Naming.Test/Jellyfin.Naming.Test.csproj
new file mode 100644
index 0000000000..85357d199f
--- /dev/null
+++ b/tests/Jellyfin.Naming.Test/Jellyfin.Naming.Test.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netcoreapp2.1</TargetFramework>
+
+        <IsPackable>false</IsPackable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="AutoFixture" Version="4.6.0" />
+        <PackageReference Include="AutoFixture.AutoMoq" Version="4.6.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
+        <PackageReference Include="Moq" Version="4.10.1" />
+        <PackageReference Include="NUnit" Version="3.11.0" />
+        <PackageReference Include="NUnit3TestAdapter" Version="3.11.2" />
+        <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
+    </ItemGroup>
+
+</Project>
diff --git a/tests/Jellyfin.Naming.Test/UnitTest1.cs b/tests/Jellyfin.Naming.Test/UnitTest1.cs
new file mode 100644
index 0000000000..1f2233e95f
--- /dev/null
+++ b/tests/Jellyfin.Naming.Test/UnitTest1.cs
@@ -0,0 +1,15 @@
+using System;
+using NUnit.Framework;
+
+namespace Jellyfin.Naming.Test
+{
+    [TestFixture]
+    public class UnitTest1
+    {
+        [Test]
+        public void Test1()
+        {
+            Assert.That(true, Is.True);
+        }
+    }
+}
\ No newline at end of file