diff --git a/src/Umbraco.Core/Composing/Composition.cs b/src/Umbraco.Core/Composing/Composition.cs
index 72d45605a6..6989d4d0a2 100644
--- a/src/Umbraco.Core/Composing/Composition.cs
+++ b/src/Umbraco.Core/Composing/Composition.cs
@@ -60,6 +60,11 @@ namespace Umbraco.Core.Composing
         /// </summary>
         public IRuntimeState RuntimeState { get; }
 
+        /// <summary>	
+        /// Gets the configurations.	
+        /// </summary>	
+        public Configs Configs { get; }
+
         #endregion
 
         #region IRegister
diff --git a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
index f63c56b64e..26322aa801 100644
--- a/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
+++ b/src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
@@ -118,7 +118,7 @@ namespace Umbraco.Tests.Runtimes
         public class TestRuntime : CoreRuntime
         {
             public TestRuntime(Configs configs, IUmbracoVersion umbracoVersion, IIOHelper ioHelper, ILogger logger, IProfiler profiler, IHostingEnvironment hostingEnvironment, IBackOfficeInfo backOfficeInfo)
-                :base(configs, umbracoVersion, ioHelper, logger,  profiler, new AspNetUmbracoBootPermissionChecker(), hostingEnvironment, backOfficeInfo, TestHelper.DbProviderFactoryCreator, TestHelper.MainDom, TestHelper.GetTypeFinder(), NoAppCache.Instance)
+                : base(Umbraco.Web.Configuration.ConfigModelConversions.ConvertGlobalSettings(configs.Global()), Umbraco.Web.Configuration.ConfigModelConversions.ConvertConnectionStrings(configs.ConnectionStrings()), umbracoVersion, ioHelper, logger,  profiler, new AspNetUmbracoBootPermissionChecker(), hostingEnvironment, backOfficeInfo, TestHelper.DbProviderFactoryCreator, TestHelper.MainDom, TestHelper.GetTypeFinder(), NoAppCache.Instance)
             {
 
             }
diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
index 9aeb668518..1675d75fc1 100644
--- a/src/Umbraco.Tests/TestHelpers/TestHelper.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
@@ -33,6 +33,7 @@ using Umbraco.Web;
 using Umbraco.Web.Hosting;
 using Umbraco.Web.Routing;
 using File = System.IO.File;
+using Umbraco.Tests.Common.Builders;
 
 namespace Umbraco.Tests.TestHelpers
 {
@@ -105,7 +106,7 @@ namespace Umbraco.Tests.TestHelpers
 
         public static IWebRoutingSettings WebRoutingSettings => _testHelperInternal.WebRoutingSettings;
 
-        public static IEmailSender EmailSender { get; } = new EmailSender(SettingsForTests.GenerateMockGlobalSettings());
+        public static IEmailSender EmailSender { get; } = new EmailSender(new GlobalSettingsBuilder().Build());
 
 
         /// <summary>