diff --git a/autoload/go/util.vim b/autoload/go/util.vim
index 3a12f013a1..4e316a802a 100644
--- a/autoload/go/util.vim
+++ b/autoload/go/util.vim
@@ -314,7 +314,9 @@ function! go#util#Shelljoin(arglist, ...) abort
     endif
 
     let ssl_save = &shellslash
-    set noshellslash
+    if has("win32")
+      set noshellslash
+    endif
     if a:0
       return join(map(copy(a:arglist), 'shellescape(v:val, ' . a:1 . ')'), ' ')
     endif
@@ -332,7 +334,9 @@ endfunction
 function! go#util#Shelllist(arglist, ...) abort
   try
     let ssl_save = &shellslash
-    set noshellslash
+    if has("win32")
+      set noshellslash
+    endif
     if a:0
       return map(copy(a:arglist), 'go#util#Shelljoin(v:val, ' . a:1 . ')')
     endif
@@ -779,7 +783,7 @@ function! go#util#TestNamesInFile() abort
     call cursor(l:line-1, 1)
     let l:line = go#util#testLine()
   endwhile
- 
+
   call setpos('.', l:startpos)
 
   let l:tests = []