diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaTypeRepositoryTest.cs
similarity index 80%
rename from src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs
rename to src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaTypeRepositoryTest.cs
index b9b64bdd5d..77f18944c0 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs
+++ b/src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaTypeRepositoryTest.cs
@@ -4,30 +4,27 @@ using Microsoft.Extensions.Logging;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
-using Umbraco.Core.Configuration.Models;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.Dtos;
+using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.Scoping;
-using Umbraco.Tests.TestHelpers;
-using Umbraco.Tests.TestHelpers.Entities;
+using Umbraco.Tests.Common.Builders;
+using Umbraco.Tests.Integration.Testing;
 using Umbraco.Tests.Testing;
 
-namespace Umbraco.Tests.Persistence.Repositories
+namespace Umbraco.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
 {
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class MediaTypeRepositoryTest : TestWithDatabaseBase
+    public class MediaTypeRepositoryTest : UmbracoIntegrationTest
     {
+        private IContentTypeCommonRepository CommonRepository => GetRequiredService<IContentTypeCommonRepository>();
+        private ILanguageRepository LanguageRepository => GetRequiredService<ILanguageRepository>();
+
         private MediaTypeRepository CreateRepository(IScopeProvider provider)
         {
-            var cacheHelper = AppCaches.Disabled;
-            var globalSettings = new GlobalSettings();
-            var templateRepository = new TemplateRepository((IScopeAccessor)provider, cacheHelper, LoggerFactory.CreateLogger<TemplateRepository>(), TestObjects.GetFileSystemsMock(), IOHelper, ShortStringHelper);
-            var commonRepository = new ContentTypeCommonRepository((IScopeAccessor)provider, templateRepository, AppCaches, ShortStringHelper);
-            var languageRepository = new LanguageRepository((IScopeAccessor)provider, AppCaches, LoggerFactory.CreateLogger<LanguageRepository>(), Microsoft.Extensions.Options.Options.Create(globalSettings));
-            return new MediaTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, LoggerFactory.CreateLogger<MediaTypeRepository>(), commonRepository, languageRepository, ShortStringHelper);
+            return new MediaTypeRepository((IScopeAccessor) provider, AppCaches.Disabled, LoggerFactory.CreateLogger<MediaTypeRepository>(), CommonRepository, LanguageRepository, ShortStringHelper);
         }
 
         private EntityContainerRepository CreateContainerRepository(IScopeProvider provider)
@@ -39,7 +36,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         [Test]
         public void Can_Move()
         {
-            var provider = TestObjects.GetScopeProvider(LoggerFactory);
+            var provider = ScopeProvider;
             using (var scope = provider.CreateScope())
             {
                 var containerRepository = CreateContainerRepository(provider);
@@ -53,7 +50,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 containerRepository.Save(container2);
 
 
-                var contentType = (IMediaType)MockedContentTypes.CreateVideoMediaType();
+                var contentType = (IMediaType)MediaTypeBuilder.CreateVideoMediaType();
                 contentType.ParentId = container2.Id;
                 repository.Save(contentType);
 
@@ -86,7 +83,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         [Test]
         public void Can_Create_Container()
         {
-            var provider = TestObjects.GetScopeProvider(LoggerFactory);
+            var provider = ScopeProvider;
             using (var scope = provider.CreateScope())
             {
                 var containerRepository = CreateContainerRepository(provider);
@@ -104,7 +101,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         [Test]
         public void Can_Delete_Container()
         {
-            var provider = TestObjects.GetScopeProvider(LoggerFactory);
+            var provider = ScopeProvider;
             using (var scope = provider.CreateScope())
             {
                 var containerRepository = CreateContainerRepository(provider);
@@ -126,7 +123,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         [Test]
         public void Can_Create_Container_Containing_Media_Types()
         {
-            var provider = TestObjects.GetScopeProvider(LoggerFactory);
+            var provider = ScopeProvider;
             using (var scope = provider.CreateScope())
             {
                 var containerRepository = CreateContainerRepository(provider);
@@ -136,7 +133,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 containerRepository.Save(container);
 
 
-                var contentType = MockedContentTypes.CreateVideoMediaType();
+                var contentType = MediaTypeBuilder.CreateVideoMediaType();
                 contentType.ParentId = container.Id;
                 repository.Save(contentType);
 
@@ -148,7 +145,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         [Test]
         public void Can_Delete_Container_Containing_Media_Types()
         {
-            var provider = TestObjects.GetScopeProvider(LoggerFactory);
+            var provider = ScopeProvider;
             using (var scope = provider.CreateScope())
             {
                 var containerRepository = CreateContainerRepository(provider);
@@ -158,7 +155,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                 containerRepository.Save(container);
 
 
-                IMediaType contentType = MockedContentTypes.CreateVideoMediaType();
+                IMediaType contentType = MediaTypeBuilder.CreateVideoMediaType();
                 contentType.ParentId = container.Id;
                 repository.Save(contentType);
 
@@ -180,13 +177,13 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Perform_Add_On_MediaTypeRepository()
         {
             // Arrange
-            var provider = TestObjects.GetScopeProvider(LoggerFactory);
+            var provider = ScopeProvider;
             using (var scope = provider.CreateScope())
             {
                 var repository = CreateRepository(provider);
 
                 // Act
-                var contentType = MockedContentTypes.CreateVideoMediaType();
+                var contentType = MediaTypeBuilder.CreateVideoMediaType();
                 repository.Save(contentType);
 
 
@@ -208,17 +205,17 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Perform_Update_On_MediaTypeRepository()
         {
             // Arrange
-            var provider = TestObjects.GetScopeProvider(LoggerFactory);
+            var provider = ScopeProvider;
             using (var scope = provider.CreateScope())
             {
                 var repository = CreateRepository(provider);
 
-                var videoMediaType = MockedContentTypes.CreateVideoMediaType();
+                var videoMediaType = MediaTypeBuilder.CreateVideoMediaType();
                 repository.Save(videoMediaType);
 
 
                 // Act
-                var mediaType = repository.Get(NodeDto.NodeIdSeed);
+                var mediaType = repository.Get(videoMediaType.Id);
 
                 mediaType.Thumbnail = "Doc2.png";
                 mediaType.PropertyGroups["Media"].PropertyTypes.Add(new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext, "subtitle")
@@ -246,13 +243,13 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Perform_Delete_On_MediaTypeRepository()
         {
             // Arrange
-            var provider = TestObjects.GetScopeProvider(LoggerFactory);
+            var provider = ScopeProvider;
             using (var scope = provider.CreateScope())
             {
                 var repository = CreateRepository(provider);
 
                 // Act
-                var mediaType = MockedContentTypes.CreateVideoMediaType();
+                var mediaType = MediaTypeBuilder.CreateVideoMediaType();
                 repository.Save(mediaType);
 
 
@@ -271,7 +268,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Perform_Get_On_MediaTypeRepository()
         {
             // Arrange
-            var provider = TestObjects.GetScopeProvider(LoggerFactory);
+            var provider = ScopeProvider;
             using (var scope = provider.CreateScope())
             {
                 var repository = CreateRepository(provider);
@@ -290,7 +287,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Perform_Get_By_Guid_On_MediaTypeRepository()
         {
             // Arrange
-            var provider = TestObjects.GetScopeProvider(LoggerFactory);
+            var provider = ScopeProvider;
             using (var scope = provider.CreateScope())
             {
                 var repository = CreateRepository(provider);
@@ -311,7 +308,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Perform_GetAll_On_MediaTypeRepository()
         {
             // Arrange
-            var provider = TestObjects.GetScopeProvider(LoggerFactory);
+            var provider = ScopeProvider;
             using (var scope = provider.CreateScope())
             {
                 var repository = CreateRepository(provider);
@@ -333,7 +330,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Perform_GetAll_By_Guid_On_MediaTypeRepository()
         {
             // Arrange
-            var provider = TestObjects.GetScopeProvider(LoggerFactory);
+            var provider = ScopeProvider;
             using (var scope = provider.CreateScope())
             {
                 var repository = CreateRepository(provider);
@@ -359,7 +356,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Perform_Exists_On_MediaTypeRepository()
         {
             // Arrange
-            var provider = TestObjects.GetScopeProvider(LoggerFactory);
+            var provider = ScopeProvider;
             using (var scope = provider.CreateScope())
             {
                 var repository = CreateRepository(provider);
@@ -376,22 +373,22 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Update_MediaType_With_PropertyType_Removed()
         {
             // Arrange
-            var provider = TestObjects.GetScopeProvider(LoggerFactory);
+            var provider = ScopeProvider;
             using (var scope = provider.CreateScope())
             {
                 var repository = CreateRepository(provider);
 
-                var mediaType = MockedContentTypes.CreateVideoMediaType();
+                var mediaType = MediaTypeBuilder.CreateVideoMediaType();
                 repository.Save(mediaType);
 
 
                 // Act
-                var mediaTypeV2 = repository.Get(NodeDto.NodeIdSeed);
+                var mediaTypeV2 = repository.Get(mediaType.Id);
                 mediaTypeV2.PropertyGroups["Media"].PropertyTypes.Remove("title");
                 repository.Save(mediaTypeV2);
 
 
-                var mediaTypeV3 = repository.Get(NodeDto.NodeIdSeed);
+                var mediaTypeV3 = repository.Get(mediaType.Id);
 
                 // Assert
                 Assert.That(mediaTypeV3.PropertyTypes.Any(x => x.Alias == "title"), Is.False);
@@ -404,17 +401,17 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Verify_PropertyTypes_On_Video_MediaType()
         {
             // Arrange
-            var provider = TestObjects.GetScopeProvider(LoggerFactory);
+            var provider = ScopeProvider;
             using (var scope = provider.CreateScope())
             {
                 var repository = CreateRepository(provider);
 
-                var mediaType = MockedContentTypes.CreateVideoMediaType();
+                var mediaType = MediaTypeBuilder.CreateVideoMediaType();
                 repository.Save(mediaType);
 
 
                 // Act
-                var contentType = repository.Get(NodeDto.NodeIdSeed);
+                var contentType = repository.Get(mediaType.Id);
 
                 // Assert
                 Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(2));
@@ -426,7 +423,7 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void Can_Verify_PropertyTypes_On_File_MediaType()
         {
             // Arrange
-            var provider = TestObjects.GetScopeProvider(LoggerFactory);
+            var provider = ScopeProvider;
             using (var scope = provider.CreateScope())
             {
                 var repository = CreateRepository(provider);
@@ -439,11 +436,5 @@ namespace Umbraco.Tests.Persistence.Repositories
                 Assert.That(contentType.PropertyGroups.Count(), Is.EqualTo(1));
             }
         }
-
-        [TearDown]
-        public override void TearDown()
-        {
-            base.TearDown();
-        }
     }
 }
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index e896550a30..17fa68a213 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -285,7 +285,6 @@
     <Compile Include="Persistence\DatabaseContextTests.cs" />
     <Compile Include="Persistence\NPocoTests\NPocoSqlTests.cs" />
     <Compile Include="Persistence\Querying\QueryBuilderTests.cs" />
-    <Compile Include="Persistence\Repositories\MediaTypeRepositoryTest.cs" />
     <Compile Include="Persistence\Repositories\ScriptRepositoryTest.cs" />
     <Compile Include="Persistence\Repositories\StylesheetRepositoryTest.cs" />
     <Compile Include="PublishedContent\PublishedContentMoreTests.cs" />