diff --git a/NzbDrone.Test.Common/TestBase.cs b/NzbDrone.Test.Common/TestBase.cs
index da36b0584..0cbe7a98a 100644
--- a/NzbDrone.Test.Common/TestBase.cs
+++ b/NzbDrone.Test.Common/TestBase.cs
@@ -22,7 +22,6 @@ public void CoreTestSetup()
         {
             _subject = null;
 
-            Mocker.SetConstant<ICacheManger>(new CacheManger());
         }
 
         protected TSubject Subject
@@ -77,6 +76,7 @@ public void TestBaseSetup()
         {
             GetType().IsPublic.Should().BeTrue("All Test fixtures should be public to work in mono.");
 
+            Mocker.SetConstant<ICacheManger>(new CacheManger());
 
             Mocker.SetConstant(LogManager.GetLogger("TestLogger"));
 
@@ -86,6 +86,7 @@ public void TestBaseSetup()
 
             MockedRestProvider = new Mock<RestProvider>();
 
+
             Directory.CreateDirectory(TempFolder);
         }
 
diff --git a/NzbDrone/NLog.config b/NzbDrone/NLog.config
index 532267a60..e0a2b46bf 100644
--- a/NzbDrone/NLog.config
+++ b/NzbDrone/NLog.config
@@ -18,7 +18,7 @@
         <layout>${exception:format=ToString}</layout>
       </parameter>
     </target>
-    <target xsi:type="File" name="rollingFileLogger" fileName="${appLog}" autoFlush="true" keepFileOpen="true"
+    <target xsi:type="File" name="rollingFileLogger" fileName="${appLog}" autoFlush="true" keepFileOpen="false"
            concurrentWrites="false" concurrentWriteAttemptDelay="50" concurrentWriteAttempts ="10"
             archiveAboveSize="1024000" maxArchiveFiles="5" enableFileDelete="true" archiveNumbering ="Rolling"
             layout="${date:format=yy-M-d HH\:mm\:ss.f}|${level}|${logger}|${message}${onexception:inner=${newline}${newline}${exception:format=ToString}${newline}}"/>