diff --git a/build/Build.bat b/build/Build.bat
index ca52c5aa2f..7bd3f7870e 100644
--- a/build/Build.bat
+++ b/build/Build.bat
@@ -17,7 +17,7 @@ FOR /F "skip=2 delims=" %%i IN (UmbracoVersion.txt) DO IF NOT DEFINED COMMENT SE
 REM process args
 
 SET INTEGRATION=0
-SET nuGetFolder=%CD%\..\src\packages\
+SET nuGetFolder=%CD%\..\src\packages
 SET SKIPNUGET=0
 
 :processArgs
@@ -114,16 +114,16 @@ SET PATH="C:\Program Files (x86)\Git\cmd";"C:\Program Files\Git\cmd";%PATH%
 
 ECHO.
 ECHO Making sure we have a web.config
-IF NOT EXIST %CD%\..\src\Umbraco.Web.UI\web.config COPY %CD%\..\src\Umbraco.Web.UI\web.Template.config %CD%\..\src\Umbraco.Web.UI\web.config
+IF NOT EXIST "%CD%\..\src\Umbraco.Web.UI\web.config" COPY "%CD%\..\src\Umbraco.Web.UI\web.Template.config" "%CD%\..\src\Umbraco.Web.UI\web.config"
 
 ECHO.
 ECHO Reporting NuGet version
-%CD%\..\src\.nuget\NuGet.exe help | findstr "^NuGet Version:"
+"%CD%\..\src\.nuget\NuGet.exe" help | findstr "^NuGet Version:"
 
 ECHO.
 ECHO Restoring NuGet packages
 ECHO Into %nuGetFolder%
-%CD%\..\src\.nuget\NuGet.exe restore %CD%\..\src\umbraco.sln -Verbosity Quiet -NonInteractive -PackagesDirectory %nuGetFolder%
+"%CD%\..\src\.nuget\NuGet.exe" restore "%CD%\..\src\umbraco.sln" -Verbosity Quiet -NonInteractive -PackagesDirectory "%nuGetFolder%"
 IF ERRORLEVEL 1 GOTO :error
 
 ECHO.
@@ -133,7 +133,7 @@ ECHO This takes a few minutes and logging is set to report warnings
 ECHO and errors only so it might seems like nothing is happening for a while. 
 ECHO You can check the msbuild.log file for progress.
 ECHO.
-%MSBUILD% "Build.proj" /p:BUILD_RELEASE=%RELEASE% /p:BUILD_COMMENT=%COMMENT% /p:NugetPackagesDirectory=%nuGetFolder% /consoleloggerparameters:Summary;ErrorsOnly /fileLogger
+%MSBUILD% "Build.proj" /p:BUILD_RELEASE=%RELEASE% /p:BUILD_COMMENT=%COMMENT% /p:NugetPackagesDirectory="%nuGetFolder%" /consoleloggerparameters:Summary;ErrorsOnly /fileLogger
 IF ERRORLEVEL 1 GOTO error
 
 ECHO.
diff --git a/build/Build.proj b/build/Build.proj
index f40cad61fa..1ec04b07c5 100644
--- a/build/Build.proj
+++ b/build/Build.proj
@@ -263,9 +263,12 @@
 
     <Message Text="Compiling web project to build\$(BuildFolder)" Importance="high" />
     <!-- For UseWPP_CopyWebApplication=True see http://stackoverflow.com/questions/1983575/copywebapplication-with-web-config-transformations -->
-    <!-- Build the Umbraco.Web.UI project -->
+    <!-- Build the Umbraco.Web.UI project (and all dependencies) -->
     <MSBuild Projects="..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);UseWPP_CopyWebApplication=True;PipelineDependsOnBuild=False;OutDir=$(SolutionBinFolderAbsolutePath);WebProjectOutputDir=$(WebAppFolderAbsolutePath);Verbosity=minimal" Targets="Clean;Rebuild;" BuildInParallel="False" ToolsVersion="14.0" UnloadProjectsOnCompletion="False" />
-    <MSBuild Projects="..\src\Umbraco.Compat7\Umbraco.Compat7.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);UseWPP_CopyWebApplication=True;PipelineDependsOnBuild=False;OutDir=$(SolutionBinFolderAbsolutePath);Verbosity=minimal" Targets="Clean;Rebuild;" BuildInParallel="False" ToolsVersion="14.0" UnloadProjectsOnCompletion="False" />
+	<!-- Build the Umbraco.Compat7 project (is not a dependency) -->
+    <MSBuild Projects="..\src\Umbraco.Compat7\Umbraco.Compat7.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);PipelineDependsOnBuild=False;OutDir=$(SolutionBinFolderAbsolutePath);Verbosity=minimal" Targets="Clean;Rebuild;" BuildInParallel="False" ToolsVersion="14.0" UnloadProjectsOnCompletion="False" />
+	<!-- Build the Umbraco.Tests project (is not a dependency) -->
+    <MSBuild Projects="..\src\Umbraco.Tests\Umbraco.Tests.csproj" Properties="WarningLevel=0;Configuration=$(BuildConfiguration);PipelineDependsOnBuild=False;OutDir=$(SolutionBinFolderAbsolutePath);Verbosity=minimal" Targets="Clean;Rebuild;" BuildInParallel="False" ToolsVersion="14.0" UnloadProjectsOnCompletion="False" />
 
     <!-- DONE -->
     <Message Text="Finished compiling projects" Importance="high" />