diff --git a/src/Umbraco.Core/Composing/Current.cs b/src/Umbraco.Core/Composing/Current.cs
index 49bb44db47..215840023a 100644
--- a/src/Umbraco.Core/Composing/Current.cs
+++ b/src/Umbraco.Core/Composing/Current.cs
@@ -37,7 +37,7 @@ namespace Umbraco.Core.Composing
         /// <summary>
         /// Gets or sets the DI container.
         /// </summary>
-        internal static IContainer Container
+        public static IContainer Container
         {
             get
             {
diff --git a/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs b/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs
index 4314af38b5..d9769cfb35 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs
@@ -34,6 +34,8 @@ namespace Umbraco.Tests.TestHelpers
 
             var container = Current.Container = ContainerFactory.Create();
 
+            PreSetUp();
+
             container.RegisterSingleton<ILogger>(factory => Mock.Of<ILogger>());
             container.RegisterSingleton<IProfiler>(factory => Mock.Of<IProfiler>());
 
@@ -55,6 +57,9 @@ namespace Umbraco.Tests.TestHelpers
             SetUp();
         }
 
+        public virtual void PreSetUp()
+        {}
+
         public virtual void SetUp()
         {}
 
diff --git a/src/Umbraco.Web/Composing/Current.cs b/src/Umbraco.Web/Composing/Current.cs
index cf1a419769..8d36028667 100644
--- a/src/Umbraco.Web/Composing/Current.cs
+++ b/src/Umbraco.Web/Composing/Current.cs
@@ -54,7 +54,7 @@ namespace Umbraco.Web.Composing
         /// <summary>
         /// Gets the DI container.
         /// </summary>
-        internal static IContainer Container
+        public static IContainer Container
             => CoreCurrent.Container;
 
         #region Temp & Special