diff --git a/src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs b/src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs
index 629d5e17b0..9985a5b1bd 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/Building/Builder.cs
@@ -16,7 +16,7 @@ namespace Umbraco.ModelsBuilder.Embedded.Building
     /// <summary>
     /// Provides a base class for all builders.
     /// </summary>
-    internal abstract class Builder
+    public abstract class Builder
     {
         private readonly IList<TypeModel> _typeModels;
 
@@ -59,7 +59,7 @@ namespace Umbraco.ModelsBuilder.Embedded.Building
         /// Gets the list of all models.
         /// </summary>
         /// <remarks>Includes those that are ignored.</remarks>
-        internal IList<TypeModel> TypeModels => _typeModels;
+        public IList<TypeModel> TypeModels => _typeModels;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Builder"/> class with a list of models to generate,
@@ -196,7 +196,7 @@ namespace Umbraco.ModelsBuilder.Embedded.Building
             return true;
         }
 
-        internal string ModelsNamespaceForTests;
+        public string ModelsNamespaceForTests;
 
         public string GetModelsNamespace()
         {
diff --git a/src/Umbraco.ModelsBuilder.Embedded/UmbracoServices.cs b/src/Umbraco.ModelsBuilder.Embedded/UmbracoServices.cs
index 8763da86a6..cc904cd015 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/UmbracoServices.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/UmbracoServices.cs
@@ -189,7 +189,7 @@ namespace Umbraco.ModelsBuilder.Embedded
             return typeModels;
         }
 
-        internal static IList<TypeModel> EnsureDistinctAliases(IList<TypeModel> typeModels)
+        public static IList<TypeModel> EnsureDistinctAliases(IList<TypeModel> typeModels)
         {
             var groups = typeModels.GroupBy(x => x.Alias.ToLowerInvariant());
             foreach (var group in groups.Where(x => x.Count() > 1))
diff --git a/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/ModelsBuilder/ConfigTests.cs
similarity index 98%
rename from src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs
rename to src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/ModelsBuilder/ConfigTests.cs
index 5ed96365fd..2e15381d18 100644
--- a/src/Umbraco.Tests/ModelsBuilder/ConfigTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/ModelsBuilder/ConfigTests.cs
@@ -1,6 +1,5 @@
 using System.Configuration;
 using NUnit.Framework;
-using Umbraco.Configuration;
 using Umbraco.Configuration.Legacy;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
diff --git a/src/Umbraco.Tests/ModelsBuilder/StringExtensions.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/ModelsBuilder/StringExtensions.cs
similarity index 100%
rename from src/Umbraco.Tests/ModelsBuilder/StringExtensions.cs
rename to src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/ModelsBuilder/StringExtensions.cs
diff --git a/src/Umbraco.Tests/ModelsBuilder/UmbracoApplicationTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/ModelsBuilder/UmbracoApplicationTests.cs
similarity index 100%
rename from src/Umbraco.Tests/ModelsBuilder/UmbracoApplicationTests.cs
rename to src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/ModelsBuilder/UmbracoApplicationTests.cs
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj
index 2cbf1549dd..6569a49a27 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj
@@ -7,6 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+      <ProjectReference Include="..\Umbraco.ModelsBuilder.Embedded\Umbraco.ModelsBuilder.Embedded.csproj" />
       <ProjectReference Include="..\Umbraco.Tests.Common\Umbraco.Tests.Common.csproj" />
       <ProjectReference Include="..\Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj" />
       <ProjectReference Include="..\Umbraco.Web.Common\Umbraco.Web.Common.csproj" />
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index f66405b48f..ad92c7e635 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -130,10 +130,6 @@
     <Compile Include="Manifest\ManifestContentAppTests.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\ImageProcessorImageUrlGeneratorTest.cs" />
     <Compile Include="Models\VariationTests.cs" />
@@ -497,10 +493,6 @@
       <Project>{3ae7bf57-966b-45a5-910a-954d7c554441}</Project>
       <Name>Umbraco.Infrastructure</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Umbraco.ModelsBuilder.Embedded\Umbraco.ModelsBuilder.Embedded.csproj">
-      <Project>{52ac0ba8-a60e-4e36-897b-e8b97a54ed1c}</Project>
-      <Name>Umbraco.ModelsBuilder.Embedded</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Umbraco.Persistance.SqlCe\Umbraco.Persistance.SqlCe.csproj">
       <Project>{33085570-9bf2-4065-a9b0-a29d920d13ba}</Project>
       <Name>Umbraco.Persistance.SqlCe</Name>