diff --git a/test/ApplyReleasesTests.cs b/test/ApplyReleasesTests.cs
index ddf78346..d2315374 100644
--- a/test/ApplyReleasesTests.cs
+++ b/test/ApplyReleasesTests.cs
@@ -33,8 +33,8 @@ namespace Squirrel.Tests
         {
             string tempDir;
             using (Utility.WithTempDirectory(out tempDir)) {
-                Directory.CreateDirectory(Path.Combine(tempDir, "theApp"));
-                var packages = Path.Combine(tempDir, "theApp", "packages");
+                var appDir = Directory.CreateDirectory(Path.Combine(tempDir, "theApp"));
+                var packages = Path.Combine(appDir.FullName, "packages");
                 Directory.CreateDirectory(packages);
 
                 var package = "Squirrel.Core.1.0.0.0-full.nupkg";
@@ -55,8 +55,8 @@ namespace Squirrel.Tests
             string tempDir;
             using (Utility.WithTempDirectory(out tempDir))
             {
-                Directory.CreateDirectory(Path.Combine(tempDir, "theApp"));
-                var packages = Path.Combine(tempDir, "theApp", "packages");
+                var appDir = Directory.CreateDirectory(Path.Combine(tempDir, "theApp"));
+                var packages = Path.Combine(appDir.FullName, "packages");
                 Directory.CreateDirectory(packages);
 
                 var baseFile = "Squirrel.Core.1.0.0.0-full.nupkg";
@@ -82,7 +82,8 @@ namespace Squirrel.Tests
             string tempDir;
 
             using (Utility.WithTempDirectory(out tempDir)) {
-                string packagesDir = Path.Combine(tempDir, "theApp", "packages");
+                string appDir = Path.Combine(tempDir, "theApp");
+                string packagesDir = Path.Combine(appDir, "packages");
                 Directory.CreateDirectory(packagesDir);
 
                 new[] {
@@ -90,7 +91,7 @@ namespace Squirrel.Tests
                     "Squirrel.Core.1.1.0.0-full.nupkg",
                 }.ForEach(x => File.Copy(IntegrationTestHelper.GetPath("fixtures", x), Path.Combine(packagesDir, x)));
 
-                var fixture = new UpdateManager.ApplyReleasesImpl(tempDir);
+                var fixture = new UpdateManager.ApplyReleasesImpl(appDir);
 
                 var baseEntry = ReleaseEntry.GenerateFromFile(Path.Combine(packagesDir, "Squirrel.Core.1.0.0.0-full.nupkg"));
                 var latestFullEntry = ReleaseEntry.GenerateFromFile(Path.Combine(packagesDir, "Squirrel.Core.1.1.0.0-full.nupkg"));
@@ -131,7 +132,8 @@ namespace Squirrel.Tests
             string tempDir;
 
             using (Utility.WithTempDirectory(out tempDir)) {
-                string packagesDir = Path.Combine(tempDir, "theApp", "packages");
+                string appDir = Path.Combine(tempDir, "theApp");
+                string packagesDir = Path.Combine(appDir, "packages");
                 Directory.CreateDirectory(packagesDir);
 
                 new[] {
@@ -139,7 +141,7 @@ namespace Squirrel.Tests
                     "Squirrel.Core.1.2.0.0-full.nupkg",
                 }.ForEach(x => File.Copy(IntegrationTestHelper.GetPath("fixtures", x), Path.Combine(packagesDir, x)));
 
-                var fixture = new UpdateManager.ApplyReleasesImpl(tempDir);
+                var fixture = new UpdateManager.ApplyReleasesImpl(appDir);
 
                 var baseEntry = ReleaseEntry.GenerateFromFile(Path.Combine(packagesDir, "Squirrel.Core.1.1.0.0-full.nupkg"));
                 var latestFullEntry = ReleaseEntry.GenerateFromFile(Path.Combine(packagesDir, "Squirrel.Core.1.2.0.0-full.nupkg"));
@@ -179,7 +181,8 @@ namespace Squirrel.Tests
 
             using (Utility.WithTempDirectory(out tempDir))
             {
-                string packagesDir = Path.Combine(tempDir, "theApp", "packages");
+                string appDir = Path.Combine(tempDir, "theApp");
+                string packagesDir = Path.Combine(appDir, "packages");
                 Directory.CreateDirectory(packagesDir);
 
                 new[] {
@@ -187,7 +190,7 @@ namespace Squirrel.Tests
                     "Squirrel.Core.1.3.0.0-full.nupkg",
                 }.ForEach(x => File.Copy(IntegrationTestHelper.GetPath("fixtures", x), Path.Combine(packagesDir, x)));
 
-                var fixture = new UpdateManager.ApplyReleasesImpl(tempDir);
+                var fixture = new UpdateManager.ApplyReleasesImpl(appDir);
 
                 var baseEntry = ReleaseEntry.GenerateFromFile(Path.Combine(packagesDir, "Squirrel.Core.1.1.0.0-full.nupkg"));
                 var latestFullEntry = ReleaseEntry.GenerateFromFile(Path.Combine(packagesDir, "Squirrel.Core.1.3.0.0-full.nupkg"));
@@ -228,7 +231,8 @@ namespace Squirrel.Tests
             string tempDir;
 
             using (Utility.WithTempDirectory(out tempDir)) {
-                string packagesDir = Path.Combine(tempDir, "theApp", "packages");
+                string appDir = Path.Combine(tempDir, "theApp");
+                string packagesDir = Path.Combine(appDir, "packages");
                 Directory.CreateDirectory(packagesDir);
 
                 new[] {
@@ -237,7 +241,7 @@ namespace Squirrel.Tests
                     "Squirrel.Core.1.1.0.0-full.nupkg",
                 }.ForEach(x => File.Copy(IntegrationTestHelper.GetPath("fixtures", x), Path.Combine(packagesDir, x)));
 
-                var fixture = new UpdateManager.ApplyReleasesImpl(tempDir);
+                var fixture = new UpdateManager.ApplyReleasesImpl(appDir);
 
                 var baseEntry = ReleaseEntry.GenerateFromFile(Path.Combine(packagesDir, "Squirrel.Core.1.0.0.0-full.nupkg"));
                 var deltaEntry = ReleaseEntry.GenerateFromFile(Path.Combine(packagesDir, "Squirrel.Core.1.1.0.0-delta.nupkg"));
@@ -278,7 +282,9 @@ namespace Squirrel.Tests
         {
             string tempDir;
             using (Utility.WithTempDirectory(out tempDir)) {
-                Directory.CreateDirectory(Path.Combine(tempDir, "theApp", "packages"));
+                string appDir = Path.Combine(tempDir, "theApp");
+                string packagesDir = Path.Combine(appDir, "packages");
+                Directory.CreateDirectory(packagesDir);
 
                 new[] {
                     "Squirrel.Core.1.0.0.0-full.nupkg",
@@ -286,7 +292,7 @@ namespace Squirrel.Tests
                 }.ForEach(x => File.Copy(IntegrationTestHelper.GetPath("fixtures", x), Path.Combine(tempDir, "theApp", "packages", x)));
 
                 var urlDownloader = new FakeUrlDownloader();
-                var fixture = new UpdateManager.ApplyReleasesImpl(tempDir);
+                var fixture = new UpdateManager.ApplyReleasesImpl(appDir);
 
                 var baseEntry = ReleaseEntry.GenerateFromFile(Path.Combine(tempDir, "theApp", "packages", "Squirrel.Core.1.0.0.0-full.nupkg"));
                 var deltaEntry = ReleaseEntry.GenerateFromFile(Path.Combine(tempDir, "theApp", "packages", "Squirrel.Core.1.1.0.0-delta.nupkg"));
diff --git a/test/UpdateManagerTests.cs b/test/UpdateManagerTests.cs
index c08fb64b..0caf448a 100644
--- a/test/UpdateManagerTests.cs
+++ b/test/UpdateManagerTests.cs
@@ -19,7 +19,8 @@ namespace Squirrel.Tests
             {
                 string tempDir;
                 using (Utility.WithTempDirectory(out tempDir)) {
-                    var packageDir = Directory.CreateDirectory(Path.Combine(tempDir, "theApp", "packages"));
+                    var appDir = Path.Combine(tempDir, "theApp");
+                    var packageDir = Directory.CreateDirectory(Path.Combine(appDir, "packages"));
 
                     new[] {
                         "Squirrel.Core.1.0.0.0-full.nupkg",
@@ -27,7 +28,7 @@ namespace Squirrel.Tests
                         "Squirrel.Core.1.1.0.0-full.nupkg",
                     }.ForEach(x => File.Copy(IntegrationTestHelper.GetPath("fixtures", x), Path.Combine(tempDir, "theApp", "packages", x)));
 
-                    var fixture = new UpdateManager.ApplyReleasesImpl(tempDir);
+                    var fixture = new UpdateManager.ApplyReleasesImpl(appDir);
 
                     await fixture.updateLocalReleasesFile();
 
@@ -45,7 +46,8 @@ namespace Squirrel.Tests
                 string tempDir;
                 using (Utility.WithTempDirectory(out tempDir))
                 {
-                    var localPackages = Path.Combine(tempDir, "theApp", "packages");
+                    var appDir = Path.Combine(tempDir, "theApp");
+                    var localPackages = Path.Combine(appDir, "packages");
                     var remotePackages = Path.Combine(tempDir, "releases");
                     Directory.CreateDirectory(localPackages);
                     Directory.CreateDirectory(remotePackages);
@@ -61,7 +63,7 @@ namespace Squirrel.Tests
                         File.Copy(path, Path.Combine(remotePackages, x));
                     });
 
-                    var fixture = new UpdateManager.ApplyReleasesImpl(tempDir);
+                    var fixture = new UpdateManager.ApplyReleasesImpl(appDir);
                         
                     // sync both release files
                     await fixture.updateLocalReleasesFile();
@@ -84,7 +86,8 @@ namespace Squirrel.Tests
                 string tempDir;
                 using (Utility.WithTempDirectory(out tempDir))
                 {
-                    var localPackages = Path.Combine(tempDir, "theApp", "packages");
+                    var appDir = Path.Combine(tempDir, "theApp");
+                    var localPackages = Path.Combine(appDir, "packages");
                     var remotePackages = Path.Combine(tempDir, "releases");
                     Directory.CreateDirectory(localPackages);
                     Directory.CreateDirectory(remotePackages);
@@ -108,7 +111,7 @@ namespace Squirrel.Tests
                         File.Copy(path, Path.Combine(remotePackages, x));
                     });
 
-                    var fixture = new UpdateManager.ApplyReleasesImpl(tempDir);
+                    var fixture = new UpdateManager.ApplyReleasesImpl(appDir);
 
                     // sync both release files
                     await fixture.updateLocalReleasesFile();
@@ -130,7 +133,8 @@ namespace Squirrel.Tests
                 string tempDir;
                 using (Utility.WithTempDirectory(out tempDir))
                 {
-                    var localPackages = Path.Combine(tempDir, "theApp", "packages");
+                    var appDir = Path.Combine(tempDir, "theApp");
+                    var localPackages = Path.Combine(appDir, "packages");
                     var remotePackages = Path.Combine(tempDir, "releases");
                     Directory.CreateDirectory(localPackages);
                     Directory.CreateDirectory(remotePackages);
@@ -149,7 +153,7 @@ namespace Squirrel.Tests
                         File.Copy(path, Path.Combine(remotePackages, x));
                     });
 
-                    var fixture = new UpdateManager.ApplyReleasesImpl(tempDir);
+                    var fixture = new UpdateManager.ApplyReleasesImpl(appDir);
 
                     // sync both release files
                     await fixture.updateLocalReleasesFile();