3 files changed, 9 insertions, 5 deletions
diff --git a/ale_linters/go/gobuild.vim b/ale_linters/go/gobuild.vim
index a44449f1..cef1ff88 100644
--- a/ale_linters/go/gobuild.vim
+++ b/ale_linters/go/gobuild.vim
@@ -3,6 +3,7 @@
 " Description: go build for Go files
 " inspired by work from dzhou121 <dzhou121@gmail.com>
 
+call ale#Set('go_go_executable', 'go')
 call ale#Set('go_gobuild_options', '')
 
 function! ale_linters#go#gobuild#GetCommand(buffer) abort
@@ -10,7 +11,7 @@ function! ale_linters#go#gobuild#GetCommand(buffer) abort
 
     " Run go test in local directory with relative path
     return ale#path#BufferCdString(a:buffer)
-    \   . 'go test'
+    \   . ale#Var(a:buffer, 'go_go_executable') . ' test'
     \   . (!empty(l:options) ? ' ' . l:options : '')
     \   . ' -c -o /dev/null ./'
 endfunction
@@ -47,7 +48,7 @@ endfunction
 call ale#linter#Define('go', {
 \   'name': 'gobuild',
 \   'aliases': ['go build'],
-\   'executable': 'go',
+\   'executable_callback': ale#VarFunc('go_go_executable'),
 \   'command_callback': 'ale_linters#go#gobuild#GetCommand',
 \   'output_stream': 'stderr',
 \   'callback': 'ale_linters#go#gobuild#Handler',
diff --git a/ale_linters/go/golangci_lint.vim b/ale_linters/go/golangci_lint.vim
index b44a6239..dd9a3c64 100644
--- a/ale_linters/go/golangci_lint.vim
+++ b/ale_linters/go/golangci_lint.vim
@@ -18,7 +18,7 @@ function! ale_linters#go#golangci_lint#GetCommand(buffer) abort
 
     return ale#path#BufferCdString(a:buffer)
     \   . '%e run '
-    \   . ale#util#EscapePCRE(l:filename)
+    \   . ale#Escape(l:filename)
     \   . ' ' . l:options
 endfunction
 
diff --git a/ale_linters/go/govet.vim b/ale_linters/go/govet.vim
index 84c23236..3d0d2adf 100644
--- a/ale_linters/go/govet.vim
+++ b/ale_linters/go/govet.vim
@@ -4,20 +4,23 @@
 " Author: John Eikenberry <jae@zhar.net>
 " Description: updated to work with go1.10
 
+call ale#Set('go_go_executable', 'go')
 call ale#Set('go_govet_options', '')
 
 function! ale_linters#go#govet#GetCommand(buffer) abort
     let l:options = ale#Var(a:buffer, 'go_govet_options')
 
-    return ale#path#BufferCdString(a:buffer) . ' go vet .'
+    return ale#path#BufferCdString(a:buffer) . ' '
+    \   . ale#Var(a:buffer, 'go_go_executable') . ' vet '
     \   . (!empty(l:options) ? ' ' . l:options : '')
+    \   . ' .'
 endfunction
 
 call ale#linter#Define('go', {
 \   'name': 'govet',
 \   'aliases': ['go vet'],
 \   'output_stream': 'stderr',
-\   'executable': 'go',
+\   'executable_callback': ale#VarFunc('go_go_executable'),
 \   'command_callback': 'ale_linters#go#govet#GetCommand',
 \   'callback': 'ale#handlers#go#Handler',
 \   'lint_file': 1,