diff --git a/src/Umbraco.Tests/Services/PropertyValidationServiceTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Services/PropertyValidationServiceTests.cs
similarity index 98%
rename from src/Umbraco.Tests/Services/PropertyValidationServiceTests.cs
rename to src/Umbraco.Tests.UnitTests/Umbraco.Core/Services/PropertyValidationServiceTests.cs
index 7b1dbc216d..8a7bad3d8c 100644
--- a/src/Umbraco.Tests/Services/PropertyValidationServiceTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Core/Services/PropertyValidationServiceTests.cs
@@ -7,14 +7,15 @@ using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.PropertyEditors.Validators;
 using Umbraco.Core.Services;
 using Umbraco.Core.Strings;
-using Umbraco.Tests.Testing;
 using Umbraco.Web.PropertyEditors;
 
 namespace Umbraco.Tests.Services
 {
     [TestFixture]
-    public class PropertyValidationServiceTests : UmbracoTestBase
+    public class PropertyValidationServiceTests
     {
+        private IShortStringHelper ShortStringHelper => new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
+
         private void MockObjects(out PropertyValidationService validationService, out IDataType dt)
         {
             var textService = new Mock<ILocalizedTextService>();
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 8c3e26b30a..429de1c159 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -161,7 +161,6 @@
     <Compile Include="Services\EntityXmlSerializerTests.cs" />
     <Compile Include="Services\MemberGroupServiceTests.cs" />
     <Compile Include="Services\MediaTypeServiceTests.cs" />
-    <Compile Include="Services\PropertyValidationServiceTests.cs" />
     <Compile Include="TestHelpers\RandomIdRamDirectory.cs" />
     <Compile Include="TestHelpers\Stubs\TestUserPasswordConfig.cs" />
     <Compile Include="Testing\Objects\TestDataSource.cs" />