diff --git a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
index 222e86f3d4..8d29833420 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
@@ -110,7 +110,7 @@ namespace Umbraco.Tests.TestHelpers
             get
             {
                 var att = GetType().GetCustomAttribute<DatabaseTestBehaviorAttribute>(false);
-                return att?.Behavior ?? DatabaseBehavior.NoDatabasePerFixture;
+                return att != null ? att.Behavior : DatabaseBehavior.NoDatabasePerFixture;
             }
         }
 
@@ -327,13 +327,20 @@ namespace Umbraco.Tests.TestHelpers
                 LogHelper.Error<BaseDatabaseFactoryTest>("Could not remove the old database file", ex);
 
                 //We will swallow this exception! That's because a sub class might require further teardown logic.
-                onFail?.Invoke(ex);
+                if (onFail != null)
+                    onFail(ex);
             }
         }
 
-        protected ServiceContext ServiceContext => ApplicationContext.Services;
+        protected ServiceContext ServiceContext
+        {
+            get { return ApplicationContext.Services; }
+        }
 
-        protected DatabaseContext DatabaseContext => ApplicationContext.DatabaseContext;
+        protected DatabaseContext DatabaseContext
+        {
+            get { return ApplicationContext.DatabaseContext; }
+        }
 
         protected UmbracoContext GetUmbracoContext(string url, int templateId, RouteData routeData = null, bool setSingleton = false)
         {
diff --git a/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs b/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
index 60125bafa0..2d6a75d025 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
@@ -207,9 +207,15 @@ namespace Umbraco.Tests.TestHelpers
             Resolution.Freeze();
         }
 
-        protected ApplicationContext ApplicationContext => ApplicationContext.Current;
+        protected ApplicationContext ApplicationContext
+        {
+            get { return ApplicationContext.Current; }
+        }
 
-        protected ILogger Logger => ProfilingLogger.Logger;
+        protected ILogger Logger
+        {
+            get { return ProfilingLogger.Logger; }
+        }
 
         protected ProfilingLogger ProfilingLogger { get; private set; }