diff --git a/src/app/FakeLib/SpecFlowHelper.fs b/src/app/FakeLib/SpecFlowHelper.fs
index 65a429befe7..a98818638b4 100644
--- a/src/app/FakeLib/SpecFlowHelper.fs
+++ b/src/app/FakeLib/SpecFlowHelper.fs
@@ -22,12 +22,14 @@ type SpecFlowParams = {
     XsltFile:           string
 }
 
+let toolname = "specflow.exe"
+
 /// SpecFlow default execution parameters.
 let SpecFlowDefaults = { 
     SubCommand =        "generateall"
     ProjectFile =       null
-    ToolName =          "specflow.exe"
-    ToolPath =          currentDirectory @@ "tools" @@ "SpecFlow"
+    ToolName =          toolname
+    ToolPath =          findToolFolderInSubPath toolname (currentDirectory @@ "tools" @@ "SpecFlow")
     WorkingDir =        null
     BinFolder =         null
     OutputFile =        null