diff --git a/NzbDrone.Common.Test/ConfigFileProviderTest.cs b/NzbDrone.Common.Test/ConfigFileProviderTest.cs
index bde0dbad0..bf2ee4bd5 100644
--- a/NzbDrone.Common.Test/ConfigFileProviderTest.cs
+++ b/NzbDrone.Common.Test/ConfigFileProviderTest.cs
@@ -17,7 +17,6 @@ namespace NzbDrone.Common.Test
         {
             WithTempAsAppPath();
 
-            //Reset config file
             var configFile = Mocker.Resolve<IAppDirectoryInfo>().GetConfigPath();
 
             if (File.Exists(configFile))
diff --git a/NzbDrone.Core.Test/Framework/CoreTest.cs b/NzbDrone.Core.Test/Framework/CoreTest.cs
index 347792e2b..d2cc9ff7e 100644
--- a/NzbDrone.Core.Test/Framework/CoreTest.cs
+++ b/NzbDrone.Core.Test/Framework/CoreTest.cs
@@ -23,6 +23,13 @@ namespace NzbDrone.Core.Test.Framework
         {
             Mocker.SetConstant<IHttpProvider>(new HttpProvider());
         }
+
+        protected void UseRealDisk()
+        {
+            Mocker.SetConstant<IDiskProvider>(new DiskProvider());
+            WithTempAsAppPath();
+        }
+
     }
 
     public abstract class CoreTest<TSubject> : CoreTest where TSubject : class
diff --git a/NzbDrone.Test.Common/TestBase.cs b/NzbDrone.Test.Common/TestBase.cs
index 5444fc69f..4d0c2a30f 100644
--- a/NzbDrone.Test.Common/TestBase.cs
+++ b/NzbDrone.Test.Common/TestBase.cs
@@ -74,7 +74,6 @@ namespace NzbDrone.Test.Common
         [SetUp]
         public void TestBaseSetup()
         {
-            WithTempAsAppPath();
 
             GetType().IsPublic.Should().BeTrue("All Test fixtures should be public to work in mono.");
 
@@ -88,7 +87,6 @@ namespace NzbDrone.Test.Common
 
             MockedRestProvider = new Mock<RestProvider>();
 
-
             Directory.CreateDirectory(TempFolder);
         }