diff --git a/NzbDrone.Common.Test/DiskProviderTests/DiskProviderFixture.cs b/NzbDrone.Common.Test/DiskProviderTests/DiskProviderFixture.cs
index 64be8603f..69f433dfa 100644
--- a/NzbDrone.Common.Test/DiskProviderTests/DiskProviderFixture.cs
+++ b/NzbDrone.Common.Test/DiskProviderTests/DiskProviderFixture.cs
@@ -159,7 +159,7 @@ namespace NzbDrone.Common.Test.DiskProviderTests
 
             TestLogger.Info("Path is: {0}", testFile);
 
-            Subject.WriteAllText(testFile, "");
+            Subject.WriteAllText(testFile, "Test");
 
             Subject.GetLastFolderWrite(SandboxFolder).Should().BeOnOrAfter(DateTime.UtcNow.AddMinutes(-1));
             Subject.GetLastFolderWrite(SandboxFolder).Should().BeBefore(DateTime.UtcNow);
diff --git a/NzbDrone.Test.Common/TestBase.cs b/NzbDrone.Test.Common/TestBase.cs
index 4cbaad94e..1b1ff4cee 100644
--- a/NzbDrone.Test.Common/TestBase.cs
+++ b/NzbDrone.Test.Common/TestBase.cs
@@ -159,7 +159,7 @@ namespace NzbDrone.Test.Common
 
         protected string GetTestFilePath()
         {
-            return GetTestFilePath(Path.GetTempFileName());
+            return GetTestFilePath(Path.GetRandomFileName());
         }
 
         protected string SandboxFolder
diff --git a/NzbDrone.sln.DotSettings b/NzbDrone.sln.DotSettings
index 03435b8b6..82bd482c5 100644
--- a/NzbDrone.sln.DotSettings
+++ b/NzbDrone.sln.DotSettings
@@ -48,6 +48,8 @@
 	<s:Boolean x:Key="/Default/Environment/UnitTesting/DisabledProviders/=Jasmine/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/UnitTesting/DisabledProviders/=MSTest/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/UnitTesting/DisabledProviders/=QUnit/@EntryIndexedValue">True</s:Boolean>
+	<s:Int64 x:Key="/Default/Environment/UnitTesting/ParallelProcessesCount/@EntryValue">4</s:Int64>
+	<s:Boolean x:Key="/Default/Environment/UnitTesting/SeparateAppDomainPerAssembly/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/QuickList/=26E712D4B91E2E49A0E92C0AFE6FF57E/Entry/=38860059D7978D4DAF1997C7CBC46A78/EntryName/@EntryValue">Backbone model</s:String>
 	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/QuickList/=26E712D4B91E2E49A0E92C0AFE6FF57E/Entry/=38860059D7978D4DAF1997C7CBC46A78/Position/@EntryValue">5</s:Int64>
 	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=09B531154963914B9AB9E2A05E1F2B44/@KeyIndexDefined">True</s:Boolean>