diff --git a/test/plugins/go.plugin.bats b/test/plugins/go.plugin.bats
index d511bd24..c89c061c 100644
--- a/test/plugins/go.plugin.bats
+++ b/test/plugins/go.plugin.bats
@@ -5,14 +5,14 @@ load ../../lib/helpers
 load ../../lib/composure
 
 @test 'ensure _go_pathmunge_wrap is defined' {
-  { [[ $CI ]] || _command_exists go; } || skip 'golang not found'
+  { _command_exists go && go version &>/dev/null ; } || skip 'golang not found'
   load ../../plugins/available/go.plugin
   run type -t _go_pathmunge_wrap
   assert_line 'function'
 }
 
 @test 'plugins go: single entry in GOPATH' {
-  { [[ $CI ]] || _command_exists go; } || skip 'golang not found'
+  { _command_exists go && go version &>/dev/null ; } || skip 'golang not found'
   export GOPATH="/foo"
   export GOROOT="/baz"
   load ../../plugins/available/go.plugin
@@ -20,7 +20,7 @@ load ../../lib/composure
 }
 
 @test 'plugins go: single entry in GOPATH, with space' {
-  { [[ $CI ]] || _command_exists go; } || skip 'golang not found'
+  { _command_exists go && go version &>/dev/null ; } || skip 'golang not found'
   export GOPATH="/foo bar"
   export GOROOT="/baz"
   load ../../plugins/available/go.plugin
@@ -28,7 +28,7 @@ load ../../lib/composure
 }
 
 @test 'plugins go: single entry in GOPATH, with escaped space' {
-  { [[ $CI ]] || _command_exists go; } || skip 'golang not found'
+  { _command_exists go && go version &>/dev/null ; } || skip 'golang not found'
   export GOPATH="/foo\ bar"
   export GOROOT="/baz"
   load ../../plugins/available/go.plugin
@@ -36,7 +36,7 @@ load ../../lib/composure
 }
 
 @test 'plugins go: multiple entries in GOPATH' {
-  { [[ $CI ]] || _command_exists go; } || skip 'golang not found'
+  { _command_exists go && go version &>/dev/null ; } || skip 'golang not found'
   export GOPATH="/foo:/bar"
   export GOROOT="/baz"
   load ../../plugins/available/go.plugin
@@ -44,7 +44,7 @@ load ../../lib/composure
 }
 
 @test 'plugins go: multiple entries in GOPATH, with space' {
-  { [[ $CI ]] || _command_exists go; } || skip 'golang not found'
+  { _command_exists go && go version &>/dev/null ; } || skip 'golang not found'
   export GOPATH="/foo:/foo bar"
   export GOROOT="/baz"
   load ../../plugins/available/go.plugin
@@ -52,7 +52,7 @@ load ../../lib/composure
 }
 
 @test 'plugins go: multiple entries in GOPATH, with escaped space' {
-  { [[ $CI ]] || _command_exists go; } || skip 'golang not found'
+  { _command_exists go && go version &>/dev/null ; } || skip 'golang not found'
   export GOPATH="/foo:/foo\ bar"
   export GOROOT="/baz"
   load ../../plugins/available/go.plugin