diff --git a/.gitignore b/.gitignore
index e38c71eef8..f5249bb70b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -207,6 +207,7 @@ src/Umbraco.Tests/TEMP/
 
 src/Umbraco.Tests.UnitTests/umbraco/Data/TEMP/
 /src/Umbraco.Web.UI.NetCore/appsettings.Local.json
-src/Umbraco.Tests.Integration/DatabaseContextTests.sdf
+src/Umbraco.Tests.Integration.SqlCe/umbraco/Data/TEMP/
+src/Umbraco.Tests.Integration.SqlCe/DatabaseContextTests.sdf
 
-src/Umbraco.Web.UI.NetCore/umbraco/config/appsettings-schema.json
+src/Umbraco.Web.UI.NetCore/umbraco/config/appsettings-schema.json
diff --git a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/DatabaseBuilderTests.cs b/src/Umbraco.Tests.Integration.SqlCe/Umbraco.Infrastructure/Persistence/DatabaseBuilderTests.cs
similarity index 95%
rename from src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/DatabaseBuilderTests.cs
rename to src/Umbraco.Tests.Integration.SqlCe/Umbraco.Infrastructure/Persistence/DatabaseBuilderTests.cs
index 8082fb8b16..80f72541a6 100644
--- a/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/DatabaseBuilderTests.cs
+++ b/src/Umbraco.Tests.Integration.SqlCe/Umbraco.Infrastructure/Persistence/DatabaseBuilderTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
@@ -24,6 +24,11 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence
         private IUmbracoDatabaseFactory UmbracoDatabaseFactory => GetRequiredService<IUmbracoDatabaseFactory>();
         private IEmbeddedDatabaseCreator EmbeddedDatabaseCreator => GetRequiredService<IEmbeddedDatabaseCreator>();
 
+        public DatabaseBuilderTests()
+        {
+            TestOptionAttributeBase.ScanAssemblies.Add(typeof(DatabaseBuilderTests).Assembly);
+        }
+
         [Test]
         public void CreateDatabase()
         {
diff --git a/src/Umbraco.Tests.Integration.SqlCe/Umbraco.Tests.Integration.SqlCe.csproj b/src/Umbraco.Tests.Integration.SqlCe/Umbraco.Tests.Integration.SqlCe.csproj
new file mode 100644
index 0000000000..9d831257e9
--- /dev/null
+++ b/src/Umbraco.Tests.Integration.SqlCe/Umbraco.Tests.Integration.SqlCe.csproj
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Examine.Lucene" Version="2.0.0-beta.154" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.7" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="Moq" Version="4.16.1" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
+    <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
+    <ProjectReference Include="..\Umbraco.PublishedCache.NuCache\Umbraco.PublishedCache.NuCache.csproj" />
+    <ProjectReference Include="..\Umbraco.Tests.Common\Umbraco.Tests.Common.csproj" />
+    <ProjectReference Include="..\Umbraco.Tests.Integration\Umbraco.Tests.Integration.csproj" />
+    <ProjectReference Include="..\Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj" />
+    <ProjectReference Include="..\Umbraco.Web.Website\Umbraco.Web.Website.csproj" />
+    <ProjectReference Include="..\Umbraco.Persistence.SqlCe\Umbraco.Persistence.SqlCe.csproj" Condition="'$(OS)' == 'Windows_NT'" />
+  </ItemGroup>
+</Project>
diff --git a/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj b/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
index 687df3b46a..663c7705c8 100644
--- a/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
+++ b/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
@@ -1,106 +1,106 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFramework>net5.0</TargetFramework>
-        <IsPackable>false</IsPackable>
-        <RootNamespace>Umbraco.Cms.Tests.Integration</RootNamespace>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <RootNamespace>Umbraco.Cms.Tests.Integration</RootNamespace>
+    <PackageId>Umbraco.Cms.Tests.Integration</PackageId>
+    <Title>Umbraco CMS Integration Tests</Title>
+    <Description>Contains helper classes for integration tests with Umbraco, including all internal integration tests.</Description>
+    <IsPackable>true</IsPackable>
+  </PropertyGroup>
 
-    <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
-        <DefineConstants>IS_WINDOWS</DefineConstants>
-    </PropertyGroup>
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
+    <DefineConstants>IS_WINDOWS</DefineConstants>
+  </PropertyGroup>
 
-    <ItemGroup>
-      <Compile Remove="App_Data\**" />
-      <Compile Remove="TEMP\**" />
-      <Compile Remove="Umbraco\**" />
-      <EmbeddedResource Remove="App_Data\**" />
-      <EmbeddedResource Remove="TEMP\**" />
-      <EmbeddedResource Remove="Umbraco\**" />
-      <None Remove="App_Data\**" />
-      <None Remove="TEMP\**" />
-      <Compile Remove="Views\**" />
-      <EmbeddedResource Remove="Views\**" />
-      <None Remove="Umbraco\**" />
-      <None Remove="Views\**" />
-      <None Remove="create_slicing_filter_condition.sh" />
-      <None Remove="Umbraco.Examine.Lucene\UmbracoExamine\TestFiles\media.xml" />
-      <EmbeddedResource Update="Umbraco.Examine.Lucene\UmbracoExamine\TestFiles.resx">
-        <Generator>ResXFileCodeGenerator</Generator>
-        <LastGenOutput>TestFiles.Designer.cs</LastGenOutput>
-      </EmbeddedResource>
-      <EmbeddedResource Update="Umbraco.Infrastructure\Services\Importing\ImportResources.resx">
-        <Generator>ResXFileCodeGenerator</Generator>
-        <LastGenOutput>ImportResources.Designer.cs</LastGenOutput>
-        <SubType>Designer</SubType>
-      </EmbeddedResource>
-      <Compile Update="Umbraco.Examine.Lucene\UmbracoExamine\TestFiles.Designer.cs">
-        <DesignTime>True</DesignTime>
-        <AutoGen>True</AutoGen>
-        <DependentUpon>TestFiles.resx</DependentUpon>
-      </Compile>
-      <Compile Update="Umbraco.Infrastructure\Services\Importing\ImportResources.Designer.cs">
-        <AutoGen>True</AutoGen>
-        <DesignTime>True</DesignTime>
-        <DependentUpon>ImportResources.resx</DependentUpon>
-      </Compile>
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Remove="App_Data\**" />
+    <Compile Remove="TEMP\**" />
+    <Compile Remove="Umbraco\**" />
+    <EmbeddedResource Remove="App_Data\**" />
+    <EmbeddedResource Remove="TEMP\**" />
+    <EmbeddedResource Remove="Umbraco\**" />
+    <None Remove="App_Data\**" />
+    <None Remove="TEMP\**" />
+    <Compile Remove="Views\**" />
+    <EmbeddedResource Remove="Views\**" />
+    <None Remove="Umbraco\**" />
+    <None Remove="Views\**" />
+    <None Remove="create_slicing_filter_condition.sh" />
+    <None Remove="Umbraco.Examine.Lucene\UmbracoExamine\TestFiles\media.xml" />
+    <EmbeddedResource Update="Umbraco.Examine.Lucene\UmbracoExamine\TestFiles.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>TestFiles.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Umbraco.Infrastructure\Services\Importing\ImportResources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>ImportResources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <Compile Update="Umbraco.Examine.Lucene\UmbracoExamine\TestFiles.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>TestFiles.resx</DependentUpon>
+    </Compile>
+    <Compile Update="Umbraco.Infrastructure\Services\Importing\ImportResources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>ImportResources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
 
-    <ItemGroup>
-      <None Remove="Umbraco.Infrastructure\Services\Importing\Dictionary-Package.xml" />
-    </ItemGroup>
+  <ItemGroup>
+    <None Remove="Umbraco.Infrastructure\Services\Importing\Dictionary-Package.xml" />
+  </ItemGroup>
 
-    <ItemGroup>
-      <Content Include="Umbraco.Examine.Lucene\UmbracoExamine\TestFiles\media.xml" />
-      <Content Include="Umbraco.Infrastructure\Services\Importing\CheckboxList-Content-Package.xml">
-        <SubType>Designer</SubType>
-      </Content>
-      <Content Include="Umbraco.Infrastructure\Services\Importing\CompositionsTestPackage-Random.xml" />
-      <Content Include="Umbraco.Infrastructure\Services\Importing\CompositionsTestPackage.xml" />
-      <Content Include="Umbraco.Infrastructure\Services\Importing\Dictionary-Package.xml" />
-      <Content Include="Umbraco.Infrastructure\Services\Importing\Fanoe-Package.xml" />
-      <Content Include="Umbraco.Infrastructure\Services\Importing\InheritedDocTypes-Package.xml" />
-      <Content Include="Umbraco.Infrastructure\Services\Importing\SingleDocType.xml" />
-      <Content Include="Umbraco.Infrastructure\Services\Importing\StandardMvc-Package.xml">
-        <SubType>Designer</SubType>
-      </Content>
-      <Content Include="Umbraco.Infrastructure\Services\Importing\TemplateOnly-Package.xml" />
-      <Content Include="Umbraco.Infrastructure\Services\Importing\TemplateOnly-Updated-Package.xml" />
-      <Content Include="Umbraco.Infrastructure\Services\Importing\uBlogsy-Package.xml" />
-      <Content Include="Umbraco.Infrastructure\Services\Importing\XsltSearch-Package.xml" />
-    </ItemGroup>
+  <ItemGroup>
+    <Content Include="Umbraco.Examine.Lucene\UmbracoExamine\TestFiles\media.xml" />
+    <Content Include="Umbraco.Infrastructure\Services\Importing\CheckboxList-Content-Package.xml">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="Umbraco.Infrastructure\Services\Importing\CompositionsTestPackage-Random.xml" />
+    <Content Include="Umbraco.Infrastructure\Services\Importing\CompositionsTestPackage.xml" />
+    <Content Include="Umbraco.Infrastructure\Services\Importing\Dictionary-Package.xml" />
+    <Content Include="Umbraco.Infrastructure\Services\Importing\Fanoe-Package.xml" />
+    <Content Include="Umbraco.Infrastructure\Services\Importing\InheritedDocTypes-Package.xml" />
+    <Content Include="Umbraco.Infrastructure\Services\Importing\SingleDocType.xml" />
+    <Content Include="Umbraco.Infrastructure\Services\Importing\StandardMvc-Package.xml">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="Umbraco.Infrastructure\Services\Importing\TemplateOnly-Package.xml" />
+    <Content Include="Umbraco.Infrastructure\Services\Importing\TemplateOnly-Updated-Package.xml" />
+    <Content Include="Umbraco.Infrastructure\Services\Importing\uBlogsy-Package.xml" />
+    <Content Include="Umbraco.Infrastructure\Services\Importing\XsltSearch-Package.xml" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Examine.Lucene" Version="2.0.0-beta.154" />
-        <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.7" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
-        <PackageReference Include="Moq" Version="4.16.1" />
-        <PackageReference Include="NUnit" Version="3.13.1" />
-        <PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
-        <PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Examine.Lucene" Version="2.0.0-beta.154" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.7" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="Moq" Version="4.16.1" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
+  </ItemGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
-      <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
-      <ProjectReference Include="..\Umbraco.PublishedCache.NuCache\Umbraco.PublishedCache.NuCache.csproj" />
-      <ProjectReference Include="..\Umbraco.Tests.Common\Umbraco.Tests.Common.csproj" />
-      <ProjectReference Include="..\Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj" />
-      <ProjectReference Include="..\Umbraco.Web.UI.NetCore\Umbraco.Web.UI.NetCore.csproj" />
-      <ProjectReference Include="..\Umbraco.Web.Website\Umbraco.Web.Website.csproj" />
-      <ProjectReference Include="..\Umbraco.Persistence.SqlCe\Umbraco.Persistence.SqlCe.csproj" Condition="'$(OS)' == 'Windows_NT'" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
+    <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
+    <ProjectReference Include="..\Umbraco.PublishedCache.NuCache\Umbraco.PublishedCache.NuCache.csproj" />
+    <ProjectReference Include="..\Umbraco.Tests.Common\Umbraco.Tests.Common.csproj" />
+    <ProjectReference Include="..\Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj" />
+    <ProjectReference Include="..\Umbraco.Web.Website\Umbraco.Web.Website.csproj" />
+  </ItemGroup>
 
-    <ItemGroup>
-      <None Update="Umbraco.Examine.Lucene\UmbracoExamine\TestFiles\umbraco-sort.config">
-        <SubType>Designer</SubType>
-      </None>
-    </ItemGroup>
+  <ItemGroup>
+    <None Update="Umbraco.Examine.Lucene\UmbracoExamine\TestFiles\umbraco-sort.config">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
 
 </Project>
diff --git a/src/umbraco-netcore-only.sln b/src/umbraco-netcore-only.sln
index 9535e362d1..893d1823d9 100644
--- a/src/umbraco-netcore-only.sln
+++ b/src/umbraco-netcore-only.sln
@@ -6,16 +6,16 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2849E9D4-3B4E-40A3-A309-F3CB4F0E125F}"
 	ProjectSection(SolutionItems) = preProject
 		..\linting\.editorconfig = ..\linting\.editorconfig
+		..\build\azure-pipelines.yml = ..\build\azure-pipelines.yml
 		..\build\build-bootstrap.ps1 = ..\build\build-bootstrap.ps1
 		..\build\build.ps1 = ..\build\build.ps1
-		..\NuGet.Config = ..\NuGet.Config
-		SolutionInfo.cs = SolutionInfo.cs
-		..\linting\stylecop.json = ..\linting\stylecop.json
 		..\linting\codeanalysis.ruleset = ..\linting\codeanalysis.ruleset
 		..\linting\codeanalysis.tests.ruleset = ..\linting\codeanalysis.tests.ruleset
 		..\Directory.Build.props = ..\Directory.Build.props
 		..\Directory.Build.targets = ..\Directory.Build.targets
-		..\build\azure-pipelines.yml = ..\build\azure-pipelines.yml
+		..\NuGet.Config = ..\NuGet.Config
+		SolutionInfo.cs = SolutionInfo.cs
+		..\linting\stylecop.json = ..\linting\stylecop.json
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{FD962632-184C-4005-A5F3-E705D92FC645}"
@@ -140,9 +140,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.UnitTests", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.Common", "Umbraco.Web.Common\Umbraco.Web.Common.csproj", "{79E4293D-C92C-4649-AEC8-F1EFD95BDEB1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Tests.Integration", "Umbraco.Tests.Integration\Umbraco.Tests.Integration.csproj", "{1B885D2F-1599-4557-A4EC-474CC74DEB10}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Tests.Integration", "Umbraco.Tests.Integration\Umbraco.Tests.Integration.csproj", "{1B885D2F-1599-4557-A4EC-474CC74DEB10}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Examine.Lucene", "Umbraco.Examine.Lucene\Umbraco.Examine.Lucene.csproj", "{B03560E9-2AEB-49C4-8031-84BCDAEB48C4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Examine.Lucene", "Umbraco.Examine.Lucene\Umbraco.Examine.Lucene.csproj", "{B03560E9-2AEB-49C4-8031-84BCDAEB48C4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Tests.Integration.SqlCe", "Umbraco.Tests.Integration.SqlCe\Umbraco.Tests.Integration.SqlCe.csproj", "{7A58F7CB-786F-43D6-A946-7BFA1B70D0AA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -198,6 +200,10 @@ Global
 		{B03560E9-2AEB-49C4-8031-84BCDAEB48C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B03560E9-2AEB-49C4-8031-84BCDAEB48C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B03560E9-2AEB-49C4-8031-84BCDAEB48C4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7A58F7CB-786F-43D6-A946-7BFA1B70D0AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A58F7CB-786F-43D6-A946-7BFA1B70D0AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7A58F7CB-786F-43D6-A946-7BFA1B70D0AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7A58F7CB-786F-43D6-A946-7BFA1B70D0AA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -213,6 +219,7 @@ Global
 		{9102ABDF-E537-4E46-B525-C9ED4833EED0} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
 		{1B885D2F-1599-4557-A4EC-474CC74DEB10} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
 		{B03560E9-2AEB-49C4-8031-84BCDAEB48C4} = {2849E9D4-3B4E-40A3-A309-F3CB4F0E125F}
+		{7A58F7CB-786F-43D6-A946-7BFA1B70D0AA} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7A0F2E34-D2AF-4DAB-86A0-7D7764B3D0EC}