diff --git a/build.cake b/build.cake
index 2bb4671e62..b5450017d0 100644
--- a/build.cake
+++ b/build.cake
@@ -157,7 +157,7 @@ Task("Build")
     }
 });
 
-void RunCoreTest(string dir)
+void RunCoreTest(string dir, Parameters parameters)
 {
     DotNetCoreRestore(dir);
     var frameworks = new List<string>{"netcoreapp1.1"};
@@ -171,14 +171,12 @@ void RunCoreTest(string dir)
     }
 }
 
-void RunDotNetCoreTest()
-{
-    RunCoreTest("./tests/Avalonia.Base.UnitTests");
-}
 
 Task("Run-Net-Core-Unit-Tests")
     .IsDependentOn("Clean")
-    .Does(() => RunDotNetCoreTest());
+    .Does(() => {
+        RunCoreTest("./tests/Avalonia.Base.UnitTests", parameters);
+    });
 
 Task("Run-Unit-Tests")
     .IsDependentOn("Run-Net-Core-Unit-Tests")
@@ -371,7 +369,7 @@ Task("AppVeyor")
   .IsDependentOn("Publish-NuGet");
 
 Task("Travis")
-  .IsDependentOn("Run-Unit-Tests");
+  .IsDependentOn("Run-Net-Core-Unit-Tests");
 
 ///////////////////////////////////////////////////////////////////////////////
 // EXECUTE
diff --git a/packages.cake b/packages.cake
index 7f9c5bdb65..ac65c26727 100644
--- a/packages.cake
+++ b/packages.cake
@@ -91,7 +91,7 @@ public class Packages
         context.Information("Package: SharpDX.DXGI, version: {0}", SharpDXDXGIVersion);
 
         var nugetPackagesDir = System.Environment.GetEnvironmentVariable("NUGET_HOME")
-            ?? System.IO.Path.Combine(System.Environment.GetEnvironmentVariable("USERPROFILE"), ".nuget");
+            ?? System.IO.Path.Combine(System.Environment.GetEnvironmentVariable("USERPROFILE") ?? System.Environment.GetEnvironmentVariable("HOME"), ".nuget");
         
         NugetPackagesDir = System.IO.Path.Combine(nugetPackagesDir, "packages");