diff --git a/src/Umbraco.Tests/Mapping/MappingTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Mapping/MappingTests.cs
similarity index 98%
rename from src/Umbraco.Tests/Mapping/MappingTests.cs
rename to src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Mapping/MappingTests.cs
index ad336168c6..ba982cd593 100644
--- a/src/Umbraco.Tests/Mapping/MappingTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Mapping/MappingTests.cs
@@ -7,7 +7,7 @@ using Umbraco.Core.Mapping;
 using Umbraco.Core.Models;
 using Umbraco.Web.Models.ContentEditing;
 
-namespace Umbraco.Tests.Mapping
+namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Mapping
 {
     [TestFixture]
     public class MappingTests
@@ -138,7 +138,6 @@ namespace Umbraco.Tests.Mapping
             {
                 // keep failing at mapping - and looping through the maps
                 for (var i = 0; i < 10; i++)
-                {
                     try
                     {
                         mapper.Map<Thing2>(thing4);
@@ -148,7 +147,6 @@ namespace Umbraco.Tests.Mapping
                         caught = e;
                         Console.WriteLine($"{e.GetType().Name} {e.Message}");
                     }
-                }
 
                 Console.WriteLine("done");
             }
@@ -185,7 +183,7 @@ namespace Umbraco.Tests.Mapping
             {
                 Fruit1 = Thing5Enum.Apple,
                 Fruit2 = Thing5Enum.Banana,
-                Fruit3= Thing5Enum.Cherry
+                Fruit3 = Thing5Enum.Cherry
             };
 
             var thing6 = mapper.Map<Thing5, Thing6>(thing5);
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 169b614eee..28e983ad95 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -132,15 +132,16 @@
     <Compile Include="LegacyXmlPublishedCache\PreviewXmlDto.cs" />
     <Compile Include="Logging\LogviewerTests.cs" />
     <Compile Include="Manifest\ManifestContentAppTests.cs" />
-    <Compile Include="Mapping\MappingTests.cs" />
     <Compile Include="Migrations\MigrationPlanTests.cs" />
     <Compile Include="Migrations\MigrationTests.cs" />
     <Compile Include="ModelsBuilder\BuilderTests.cs" />
     <Compile Include="ModelsBuilder\ConfigTests.cs" />
     <Compile Include="ModelsBuilder\StringExtensions.cs" />
     <Compile Include="ModelsBuilder\UmbracoApplicationTests.cs" />
+    <Compile Include="Models\ContentXmlTest.cs" />
     <Compile Include="Models\CultureImpactTests.cs" />
     <Compile Include="Models\ImageProcessorImageUrlGeneratorTest.cs" />
+    <Compile Include="Models\Mapping\UserModelMapperTests.cs" />
     <Compile Include="Models\VariationTests.cs" />
     <Compile Include="Persistence\Mappers\MapperTestBase.cs" />
     <Compile Include="Persistence\Repositories\DocumentRepositoryTest.cs" />
@@ -184,7 +185,6 @@
     <Compile Include="Issues\U9560.cs" />
     <Compile Include="Integration\ContentEventsTests.cs" />
     <Compile Include="Migrations\AdvancedMigrationTests.cs" />
-    <Compile Include="Models\Mapping\UserModelMapperTests.cs" />
     <Compile Include="Packaging\PackageExtractionTests.cs" />
     <Compile Include="Persistence\NPocoTests\NPocoFetchTests.cs" />
     <Compile Include="Persistence\NPocoTests\NPocoSqlTemplateTests.cs" />
@@ -390,7 +390,6 @@
     <Compile Include="IO\IoHelperTests.cs" />
     <Compile Include="PropertyEditors\PropertyEditorValueConverterTests.cs" />
     <Compile Include="Models\ContentTests.cs" />
-    <Compile Include="Models\ContentXmlTest.cs" />
     <Compile Include="Persistence\SqlCeTableByTableTest.cs" />
     <Compile Include="Persistence\DatabaseContextTests.cs" />
     <Compile Include="Persistence\Mappers\ContentMapperTest.cs" />