diff --git a/src/compile.env.darwin b/src/compile.env.darwin
index 6550cf6..bb2429e 100644
--- a/src/compile.env.darwin
+++ b/src/compile.env.darwin
@@ -5,4 +5,4 @@ else
 fi
 
 export GOPATH=$PWD
-export PATH=$GOROOT/bin:$PATH
+export PATH=$GOROOT/bin:$GOPATH/bin:$PATH
diff --git a/src/compile.env.generic b/src/compile.env.generic
index adf86d6..b59d993 100644
--- a/src/compile.env.generic
+++ b/src/compile.env.generic
@@ -7,4 +7,4 @@ else
 fi
 
 export GOPATH=$PWD
-export PATH=$GOROOT/bin:$PATH
+export PATH=$GOROOT/bin:$GOPATH/bin:$PATH
diff --git a/src/compile.env.linux b/src/compile.env.linux
index c624b53..47bb8c9 100644
--- a/src/compile.env.linux
+++ b/src/compile.env.linux
@@ -5,4 +5,4 @@ else
 fi
 
 export GOPATH=$PWD
-export PATH=$GOROOT/bin:$PATH
+export PATH=$GOROOT/bin:$GOPATH/bin:$PATH
diff --git a/src/compile.env.windows b/src/compile.env.windows
index 58ac92d..81cca8f 100644
--- a/src/compile.env.windows
+++ b/src/compile.env.windows
@@ -7,7 +7,7 @@ try {
   }
 
   $env:GOPATH="${PWD}"
-  $env:PATH="${env:GOROOT}\bin;${env:PATH}"
+  $env:PATH="${env:GOROOT}\bin;${env:GOPATH}\bin;${env:PATH}"
   Exit 1
 } catch {
   Write-Error $_.Exception.Message
diff --git a/src/runtime.env.linux b/src/runtime.env.linux
index ccee3b3..7633002 100644
--- a/src/runtime.env.linux
+++ b/src/runtime.env.linux
@@ -1,3 +1,3 @@
 export GOROOT=$(readlink -nf /var/vcap/packages/golang-1.8-linux)
-export GOPATH=$PWD
-export PATH=$GOROOT/bin:$PATH
+export GOPATH="${PWD}"
+export PATH="${GOROOT}/bin:${GOPATH}/bin:${PATH}"
diff --git a/src/runtime.env.windows b/src/runtime.env.windows
index b435087..f87ba9c 100644
--- a/src/runtime.env.windows
+++ b/src/runtime.env.windows
@@ -1,7 +1,7 @@
 try {
   $env:GOROOT=(Get-ChildItem -Path C:\var\vcap\packages\golang-*-windows\go).FullName
   $env:GOPATH="${PWD}"
-  $env:PATH="${env:GOROOT}\bin;${env:PATH}"
+  $env:PATH="${env:GOROOT}\bin;${env:GOPATH}\bin;${env:PATH}"
 } catch {
   Write-Error $_.Exception.Message
   Exit 1