diff --git a/src/Umbraco.Tests.Common/TestHelperBase.cs b/src/Umbraco.Tests.Common/TestHelperBase.cs
index be43ad6d38..88886246cd 100644
--- a/src/Umbraco.Tests.Common/TestHelperBase.cs
+++ b/src/Umbraco.Tests.Common/TestHelperBase.cs
@@ -48,11 +48,14 @@ namespace Umbraco.Tests.Common
             return new TypeLoader(IOHelper, Mock.Of<ITypeFinder>(), Mock.Of<IAppPolicyCache>(), new DirectoryInfo(IOHelper.MapPath("~/App_Data/TEMP")), Mock.Of<IProfilingLogger>());
         }
 
-        public Configs GetConfigs()
+        public Configs Configs
         {
-            if (_configs == null)
-                _configs = GetConfigsFactory().Create();
-            return _configs;
+            get
+            {
+                if (_configs == null)
+                    _configs = ConfigsFactory.Create();
+                return _configs;
+            }
         }
 
         public IRuntimeState GetRuntimeState()
@@ -62,7 +65,7 @@ namespace Umbraco.Tests.Common
                 Mock.Of<IGlobalSettings>(),
                 new Lazy<IMainDom>(),
                 new Lazy<IServerRegistrar>(),
-                GetUmbracoVersion(),
+                UmbracoVersion,
                 GetHostingEnvironment(),
                 GetBackOfficeInfo()
                 );
@@ -70,11 +73,14 @@ namespace Umbraco.Tests.Common
 
         public abstract IBackOfficeInfo GetBackOfficeInfo();
 
-        public IConfigsFactory GetConfigsFactory()
+        public IConfigsFactory ConfigsFactory
         {
-            if (_configsFactory == null)
-                _configsFactory = new ConfigsFactory();
-            return _configsFactory;
+            get
+            {
+                if (_configsFactory == null)
+                    _configsFactory = new ConfigsFactory();
+                return _configsFactory;
+            }
         }
 
         /// <summary>
@@ -137,16 +143,19 @@ namespace Umbraco.Tests.Common
             return relativePath.Replace("~/", CurrentAssemblyDirectory + "/");
         }
 
-        public IUmbracoVersion GetUmbracoVersion()
+        public IUmbracoVersion UmbracoVersion
         {
-            if (_umbracoVersion == null)
-                _umbracoVersion = new UmbracoVersion(GetConfigs().Global());
-            return _umbracoVersion;
+            get
+            {
+                if (_umbracoVersion == null)
+                    _umbracoVersion = new UmbracoVersion(Configs.Global());
+                return _umbracoVersion;
+            }
         }
 
         public IRegister GetRegister()
         {
-            return RegisterFactory.Create(GetConfigs().Global());
+            return RegisterFactory.Create(Configs.Global());
         }
 
         public abstract IHostingEnvironment GetHostingEnvironment();
diff --git a/src/Umbraco.Tests.Integration/ContainerTests.cs b/src/Umbraco.Tests.Integration/ContainerTests.cs
index b85471b95a..77725ce575 100644
--- a/src/Umbraco.Tests.Integration/ContainerTests.cs
+++ b/src/Umbraco.Tests.Integration/ContainerTests.cs
@@ -42,10 +42,10 @@ namespace Umbraco.Tests.Integration
 
             // Register in the container
             var composition = new Composition(umbracoContainer, typeLoader,
-                testHelper.Logger, runtimeState, testHelper.GetConfigs(), testHelper.IOHelper, testHelper.AppCaches);
+                testHelper.Logger, runtimeState, testHelper.Configs, testHelper.IOHelper, testHelper.AppCaches);
             composition.RegisterEssentials(testHelper.Logger, testHelper.Profiler, testHelper.Logger, testHelper.MainDom,
                 testHelper.AppCaches, umbracoDatabaseFactory, typeLoader, runtimeState, testHelper.GetTypeFinder(),
-                testHelper.IOHelper, testHelper.GetUmbracoVersion(), dbProviderFactoryCreator);
+                testHelper.IOHelper, testHelper.UmbracoVersion, dbProviderFactoryCreator);
 
             // Cross wire - this would be called by the Host Builder at the very end of ConfigureServices
             var lightInjectServiceProvider = serviceProviderFactory.CreateServiceProvider(umbracoContainer.Container);
diff --git a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
index 5254892b23..e98f4d108a 100644
--- a/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
+++ b/src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
@@ -69,7 +69,7 @@ namespace Umbraco.Tests.Integration.Implementations
         public override IBackOfficeInfo GetBackOfficeInfo()
         {
             if (_backOfficeInfo == null)
-                _backOfficeInfo = new AspNetCoreBackOfficeInfo(SettingsForTests.GetDefaultGlobalSettings(GetUmbracoVersion()));
+                _backOfficeInfo = new AspNetCoreBackOfficeInfo(SettingsForTests.GetDefaultGlobalSettings(UmbracoVersion));
             return _backOfficeInfo;
         }
 
diff --git a/src/Umbraco.Tests.Integration/RuntimeTests.cs b/src/Umbraco.Tests.Integration/RuntimeTests.cs
index 6ccfdd76d6..0a8b250cec 100644
--- a/src/Umbraco.Tests.Integration/RuntimeTests.cs
+++ b/src/Umbraco.Tests.Integration/RuntimeTests.cs
@@ -35,7 +35,7 @@ namespace Umbraco.Tests.Integration
 
             // Create the core runtime
             var testHelper = new TestHelper();
-            var coreRuntime = new CoreRuntime(testHelper.GetConfigs(), testHelper.GetUmbracoVersion(),
+            var coreRuntime = new CoreRuntime(testHelper.Configs, testHelper.UmbracoVersion,
                 testHelper.IOHelper, testHelper.Logger, testHelper.Profiler, testHelper.UmbracoBootPermissionChecker,
                 testHelper.GetHostingEnvironment(), testHelper.GetBackOfficeInfo(), testHelper.DbProviderFactoryCreator,
                 testHelper.MainDom, testHelper.GetTypeFinder());
diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
index 05d4de6e23..cf3554f3af 100644
--- a/src/Umbraco.Tests/TestHelpers/TestHelper.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
@@ -56,7 +56,7 @@ namespace Umbraco.Tests.TestHelpers
 
             public override IBackOfficeInfo GetBackOfficeInfo()
                 => new AspNetBackOfficeInfo(
-                    SettingsForTests.GenerateMockGlobalSettings(GetUmbracoVersion()),
+                    SettingsForTests.GenerateMockGlobalSettings(UmbracoVersion),
                     TestHelper.IOHelper, Mock.Of<ILogger>(), SettingsForTests.GenerateMockWebRoutingSettings());
 
             public override IHostingEnvironment GetHostingEnvironment()
@@ -70,13 +70,13 @@ namespace Umbraco.Tests.TestHelpers
 
         public static TypeLoader GetMockedTypeLoader() => _testHelperInternal.GetMockedTypeLoader();
 
-        public static Configs GetConfigs() => _testHelperInternal.GetConfigs();
+        public static Configs GetConfigs() => _testHelperInternal.Configs;
 
         public static IRuntimeState GetRuntimeState() => _testHelperInternal.GetRuntimeState();
 
         public static IBackOfficeInfo GetBackOfficeInfo() => _testHelperInternal.GetBackOfficeInfo();
 
-        public static IConfigsFactory GetConfigsFactory() => _testHelperInternal.GetConfigsFactory();
+        public static IConfigsFactory GetConfigsFactory() => _testHelperInternal.ConfigsFactory;
 
         /// <summary>
         /// Gets the current assembly directory.
@@ -314,7 +314,7 @@ namespace Umbraco.Tests.TestHelpers
         }
 
 
-        public static IUmbracoVersion GetUmbracoVersion() => _testHelperInternal.GetUmbracoVersion();
+        public static IUmbracoVersion GetUmbracoVersion() => _testHelperInternal.UmbracoVersion;
 
         public static IRegister GetRegister() => _testHelperInternal.GetRegister();