diff --git a/src/Umbraco.Tests/Packaging/CreatedPackagesRepositoryTests.cs b/src/Umbraco.Tests.Integration/Packaging/CreatedPackagesRepositoryTests.cs
similarity index 80%
rename from src/Umbraco.Tests/Packaging/CreatedPackagesRepositoryTests.cs
rename to src/Umbraco.Tests.Integration/Packaging/CreatedPackagesRepositoryTests.cs
index d5988439b4..3243c267eb 100644
--- a/src/Umbraco.Tests/Packaging/CreatedPackagesRepositoryTests.cs
+++ b/src/Umbraco.Tests.Integration/Packaging/CreatedPackagesRepositoryTests.cs
@@ -3,43 +3,58 @@ using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using System.Xml.Linq;
 using NUnit.Framework;
 using Umbraco.Core;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.Models;
+using Umbraco.Core.Hosting;
 using Umbraco.Core.Models.Packaging;
 using Umbraco.Core.Packaging;
 using Umbraco.Core.Services;
-using Umbraco.Tests.TestHelpers;
+using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
 namespace Umbraco.Tests.Packaging
 {
     [TestFixture]
+    [Explicit] // TODO: find out why tests only run one at at time, the tests get blocked after the first test
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerFixture)]
-    public class CreatedPackagesRepositoryTests : TestWithDatabaseBase
+    public class CreatedPackagesRepositoryTests : UmbracoIntegrationTest
     {
         private Guid _testBaseFolder;
 
-        public override void SetUp()
+        public override Task Setup()
         {
-            base.SetUp();
             _testBaseFolder = Guid.NewGuid();
+            return base.Setup();
         }
 
         public override void TearDown()
         {
             base.TearDown();
-
             //clear out files/folders
-            Directory.Delete(IOHelper.MapPath("~/" + _testBaseFolder), true);
+            Directory.Delete(HostingEnvironment.MapPathContentRoot("~/" + _testBaseFolder), true);
+
         }
 
+        private IContentService ContentService => GetRequiredService<IContentService>();
+        private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+        private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
+        private IFileService FileService => GetRequiredService<IFileService>();
+        private IMacroService MacroService => GetRequiredService<IMacroService>();
+        private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
+        private IEntityXmlSerializer EntityXmlSerializer => GetRequiredService<IEntityXmlSerializer>();
+        private IHostingEnvironment HostingEnvironment => GetRequiredService<IHostingEnvironment>();
+        private IUmbracoVersion UmbracoVersion => GetRequiredService<IUmbracoVersion>();
+
         public ICreatedPackagesRepository PackageBuilder => new PackagesRepository(
-            ServiceContext.ContentService, ServiceContext.ContentTypeService, ServiceContext.DataTypeService,
-            ServiceContext.FileService, ServiceContext.MacroService, ServiceContext.LocalizationService,
+            ContentService, ContentTypeService, DataTypeService,
+            FileService, MacroService, LocalizationService,
             HostingEnvironment,
-            Factory.GetInstance<IEntityXmlSerializer>(), Logger,
+            EntityXmlSerializer, Logger,
             UmbracoVersion,
             Microsoft.Extensions.Options.Options.Create(new GlobalSettings()),
             "createdPackages.config",
diff --git a/src/Umbraco.Tests.Integration/Packaging/Packages/Document_Type_Picker_1.1.umb b/src/Umbraco.Tests.Integration/Packaging/Packages/Document_Type_Picker_1.1.umb
new file mode 100644
index 0000000000..18449bd373
Binary files /dev/null and b/src/Umbraco.Tests.Integration/Packaging/Packages/Document_Type_Picker_1.1.umb differ
diff --git a/src/Umbraco.Tests/Services/ConsentServiceTests.cs b/src/Umbraco.Tests.Integration/Services/ConsentServiceTests.cs
similarity index 94%
rename from src/Umbraco.Tests/Services/ConsentServiceTests.cs
rename to src/Umbraco.Tests.Integration/Services/ConsentServiceTests.cs
index a27d6a164e..7b01bc126f 100644
--- a/src/Umbraco.Tests/Services/ConsentServiceTests.cs
+++ b/src/Umbraco.Tests.Integration/Services/ConsentServiceTests.cs
@@ -2,19 +2,21 @@
 using System.Linq;
 using NUnit.Framework;
 using Umbraco.Core.Models;
-using Umbraco.Tests.TestHelpers;
+using Umbraco.Core.Services;
+using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
 namespace Umbraco.Tests.Services
 {
     [TestFixture]
+    [Explicit]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerFixture)]
-    public class ConsentServiceTests : TestWithDatabaseBase
+    public class ConsentServiceTests : UmbracoIntegrationTest
     {
         [Test]
         public void CanCrudConsent()
         {
-            var consentService = ServiceContext.ConsentService;
+            var consentService = GetRequiredService<IConsentService>();
 
             // can register
 
@@ -109,7 +111,7 @@ namespace Umbraco.Tests.Services
         [Test]
         public void CanRegisterConsentWithoutComment()
         {
-            var consentService = ServiceContext.ConsentService;
+            var consentService = GetRequiredService<IConsentService>();
 
             // Attept to add consent without a comment
             consentService.RegisterConsent("user/1234", "app1", "consentWithoutComment", ConsentState.Granted);
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 8bb8937992..9c026de798 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -160,7 +160,6 @@
     <Compile Include="Services\ContentServiceTagsTests.cs" />
     <Compile Include="Services\ContentTypeServiceVariantsTests.cs" />
     <Compile Include="Services\EntityXmlSerializerTests.cs" />
-    <Compile Include="Packaging\CreatedPackagesRepositoryTests.cs" />
     <Compile Include="Services\MemberGroupServiceTests.cs" />
     <Compile Include="Services\MediaTypeServiceTests.cs" />
     <Compile Include="Services\PropertyValidationServiceTests.cs" />
@@ -186,7 +185,6 @@
     <Compile Include="Scoping\ScopedNuCacheTests.cs" />
     <Compile Include="Scoping\ScopeTests.cs" />
     <Compile Include="Services\CachedDataTypeServiceTests.cs" />
-    <Compile Include="Services\ConsentServiceTests.cs" />
     <Compile Include="TestHelpers\ControllerTesting\AuthenticateEverythingExtensions.cs" />
     <Compile Include="TestHelpers\ControllerTesting\AuthenticateEverythingMiddleware.cs" />
     <Compile Include="TestHelpers\ControllerTesting\SpecificAssemblyResolver.cs" />