diff --git a/NzbDrone.Common/IEnvironmentProvider.cs b/NzbDrone.Common/IEnvironmentProvider.cs
index dfabe708a..ed9c163f2 100644
--- a/NzbDrone.Common/IEnvironmentProvider.cs
+++ b/NzbDrone.Common/IEnvironmentProvider.cs
@@ -9,8 +9,7 @@ public interface IEnvironmentProvider
     {
         bool IsUserInteractive { get; }
         string WorkingDirectory { get; }
-        string StartUpPath { get; }
-        String SystemTemp { get; }
+        string SystemTemp { get; }
         Version Version { get; }
         DateTime BuildDateTime { get; }
         Version GetOsVersion();
@@ -35,8 +34,6 @@ public static bool IsProduction
                 if (lowerProcessName.Contains("jetbrain")) return false;
                 if (lowerProcessName.Contains("resharper")) return false;
 
-                if (Instance.StartUpPath.ToLower().Contains("_rawpackage")) return false;
-
                 return true;
             }
         }
@@ -79,7 +76,7 @@ public virtual bool IsUserInteractive
 
         public virtual string WorkingDirectory
         {
-            get { return Directory.GetCurrentDirectory(); }
+            get { return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "NzbDrone"); }
         }
 
         public virtual string StartUpPath
diff --git a/NzbDrone.Update.Test/UpdateProviderVerifyFixture.cs b/NzbDrone.Update.Test/UpdateProviderVerifyFixture.cs
index b5c1ed80a..bd5635971 100644
--- a/NzbDrone.Update.Test/UpdateProviderVerifyFixture.cs
+++ b/NzbDrone.Update.Test/UpdateProviderVerifyFixture.cs
@@ -1,7 +1,5 @@
-
-using System;
+using System;
 using System.IO;
-
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Common;
@@ -18,9 +16,6 @@ public class UpdateProviderVerifyFixture : TestBase
         [SetUp]
         public void Setup()
         {
-            Mocker.GetMock<IEnvironmentProvider>()
-                .Setup(c => c.StartUpPath).Returns(@"C:\Temp\NzbDrone_update\");
-
             Mocker.GetMock<IEnvironmentProvider>()
                 .Setup(c => c.SystemTemp).Returns(@"C:\Temp\");
         }