diff --git a/Build/build.cake b/Build/build.cake
index 4b78be84..13758730 100644
--- a/Build/build.cake
+++ b/Build/build.cake
@@ -69,14 +69,13 @@ Task("Test")
     }
     else
     {
-      var args =  FSDotNet.ToTestArgumentList(
+      var args =  FSDotNet.ToTestPropertiesList(
                       altcoverSettings.PreparationPhase,
                       altcoverSettings.CollectionPhase,
                       altcoverSettings.Options).ToArray();
 
       Array.ForEach(args, 
-        s => { var bits = s.Substring(3).Split('=', StringSplitOptions.RemoveEmptyEntries);
-               testSettings.EnvironmentVariables[bits[0]] = bits[1].Trim('"');});
+        s => { testSettings.EnvironmentVariables[s.Item1] = s.Item2;});
     }
 
     DotNetTest("./_DotnetTest/cake_dotnettest.fsproj", testSettings);
diff --git a/Fake/Build/targets.fs b/Fake/Build/targets.fs
index aaf111a1..4b975a28 100644
--- a/Fake/Build/targets.fs
+++ b/Fake/Build/targets.fs
@@ -5762,7 +5762,7 @@ module Targets =
                   "DebugSymbols", "True" ] })
         "./Samples/Sample4/Sample4LongForm.fsproj")
 
-  let Cake1Test =
+  let Cake2Test =
     (fun _ ->
       let before = Actions.ticksNow ()
 
@@ -7948,7 +7948,7 @@ module Targets =
 
     _Target "JsonReporting" JsonReporting
     _Target "MSBuildTest" MSBuildTest
-    _Target "Cake1Test" Cake1Test
+    _Target "Cake2Test" Cake2Test
     _Target "ApiUse" ApiUse
     _Target "DotnetTestIntegration" DotnetTestIntegration
     _Target "Issue20" Issue20
@@ -8227,7 +8227,7 @@ module Targets =
 
     "Unpack" ==> "ApiUse" ==> "Deployment" |> ignore
 
-    "Unpack" ==> "Cake1Test" ==> "Deployment"
+    "Unpack" ==> "Cake2Test" ==> "Deployment"
     |> ignore
 
     "Unpack"
diff --git a/Fake/Fake.sln b/Fake/Fake.sln
index 06654e73..d7b85d0e 100644
--- a/Fake/Fake.sln
+++ b/Fake/Fake.sln
@@ -9,6 +9,7 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Build", "Build\Build.fsproj
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BE747F78-C635-4A21-A336-5D6DA9EDF082}"
 	ProjectSection(SolutionItems) = preProject
+		..\Build\build.cake = ..\Build\build.cake
 		Directory.Build.props = Directory.Build.props
 		Build\DriveApi.fsx = Build\DriveApi.fsx
 		..\Build\Pester.Tests.ps1 = ..\Build\Pester.Tests.ps1