diff --git a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
index 34767c8e48..99a92ee10b 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
@@ -101,9 +101,15 @@ namespace Umbraco.Tests.TestHelpers
         [TearDown]
         public virtual void TearDown()
         {
-			DatabaseContext.Database.Dispose();
-			//reset the app context            
-			ApplicationContext.ApplicationCache.ClearAllCache();
+            if (ApplicationContext != null)
+            {
+                if (DatabaseContext != null && DatabaseContext.Database != null)
+                {
+                    DatabaseContext.Database.Dispose();        
+                }
+                //reset the app context            
+                ApplicationContext.ApplicationCache.ClearAllCache();    
+            }
 
             SqlSyntaxContext.SqlSyntaxProvider = null;