diff --git a/plugins/available/go.plugin.bash b/plugins/available/go.plugin.bash
index ddcc7f86..566d7669 100755
--- a/plugins/available/go.plugin.bash
+++ b/plugins/available/go.plugin.bash
@@ -16,6 +16,4 @@ function _go_pathmunge_wrap() {
 
 export GOROOT="${GOROOT:-$(go env GOROOT)}"
 export GOPATH="${GOPATH:-$(go env GOPATH)}"
-echo $PATH
 _go_pathmunge_wrap "${GOPATH}:${GOROOT}"
-echo $PATH
diff --git a/test/plugins/go.plugin.bats b/test/plugins/go.plugin.bats
index 7d7427bd..ee3c715f 100644
--- a/test/plugins/go.plugin.bats
+++ b/test/plugins/go.plugin.bats
@@ -51,78 +51,44 @@ load ../../lib/composure
   assert_line 'function'
 }
 
-@test 'debug travis' {
-  export GOROOT='/foo'
-  export GOPATH='/bar'
-
+@test 'plugins go: single entry in GOPATH' {
+  export GOPATH="/foo"
+  export GOROOT="/baz"
   load ../../plugins/available/go.plugin
-  run _go_pathmunge_wrap "${GOPATH}:${GOROOT}"
-  assert_line 'dummy'
+  assert_equal "$(cut -d':' -f1,2 <<<$PATH)" "/foo/bin:/baz/bin"
 }
 
-#@test 'plugins go: single entry in GOPATH' {
-#  export GOROOT='/baz'
-#  export GOPATH='/foo'
-#  load ../../plugins/available/go.plugin
-#  assert_equal $(cut -d':' -f1,2 <<<$PATH) '/foo/bin:/baz/bin'
-#}
-#
-#@test 'plugins go: single entry in GOPATH, with space' {
-#  export GOROOT="/baz"
-#  export GOPATH="/foo bar"
-#  load ../../plugins/available/go.plugin
-#
-#  echo "$(echo $PATH | cut -d':' -f1)"
-#  [ "$(echo $PATH | cut -d':' -f1)" = "/foo bar/bin" ]
-#
-#  echo "$(echo $PATH | cut -d':' -f2)"
-#  [ "$(echo $PATH | cut -d':' -f2)" = "/baz/bin" ]
-#}
-#
-#@test 'plugins go: single entry in GOPATH, with escaped space' {
-#  export GOROOT="/baz"
-#  export GOPATH="/foo\ bar"
-#  load ../../plugins/available/go.plugin
-#
-#  echo "$(echo $PATH | cut -d':' -f1)"
-#  [ "$(echo $PATH | cut -d':' -f1)" = "/foo\ bar/bin" ]
-#
-#  echo "$(echo $PATH | cut -d':' -f2)"
-#  [ "$(echo $PATH | cut -d':' -f2)" = "/baz/bin" ]
-#}
-#
-#@test 'plugins go: multiple entries in GOPATH' {
-#  export GOROOT="/baz"
-#  export GOPATH="/foo:/bar"
-#  load ../../plugins/available/go.plugin
-#
-#  echo "$(echo $PATH | cut -d':' -f1,2)"
-#  [ "$(echo $PATH | cut -d':' -f1,2)" = "/foo/bin:/bar/bin" ]
-#
-#  echo "$(echo $PATH | cut -d':' -f3)"
-#  [ "$(echo $PATH | cut -d':' -f3)" = "/baz/bin" ]
-#}
-#
-#@test 'plugins go: multiple entries in GOPATH, with space' {
-#  export GOROOT="/baz"
-#  export GOPATH="/foo:/foo bar"
-#  load ../../plugins/available/go.plugin
-#
-#  echo "$(echo $PATH | cut -d':' -f1,2)"
-#  [ "$(echo $PATH | cut -d':' -f1,2)" = "/foo/bin:/foo bar/bin" ]
-#
-#  echo "$(echo $PATH | cut -d':' -f3)"
-#  [ "$(echo $PATH | cut -d':' -f3)" = "/baz/bin" ]
-#}
-#
-#@test 'plugins go: multiple entries in GOPATH, with escaped space' {
-#  export GOROOT="/baz"
-#  export GOPATH="/foo:/foo\ bar"
-#  load ../../plugins/available/go.plugin
-#
-#  echo "$(echo $PATH | cut -d':' -f1,2)"
-#  [ "$(echo $PATH | cut -d':' -f1,2)" = "/foo/bin:/foo\ bar/bin" ]
-#
-#  echo "$(echo $PATH | cut -d':' -f3)"
-#  [ "$(echo $PATH | cut -d':' -f3)" = "/baz/bin" ]
-#}
+@test 'plugins go: single entry in GOPATH, with space' {
+  export GOPATH="/foo bar"
+  export GOROOT="/baz"
+  load ../../plugins/available/go.plugin
+  assert_equal "$(cut -d':' -f1,2 <<<$PATH)" "/foo bar/bin:/baz/bin"
+}
+
+@test 'plugins go: single entry in GOPATH, with escaped space' {
+  export GOPATH="/foo\ bar"
+  export GOROOT="/baz"
+  load ../../plugins/available/go.plugin
+  assert_equal "$(cut -d':' -f1,2 <<<$PATH)" "/foo\ bar/bin:/baz/bin"
+}
+
+@test 'plugins go: multiple entries in GOPATH' {
+  export GOPATH="/foo:/bar"
+  export GOROOT="/baz"
+  load ../../plugins/available/go.plugin
+  assert_equal "$(cut -d':' -f1,2,3 <<<$PATH)" "/foo/bin:/bar/bin:/baz/bin"
+}
+
+@test 'plugins go: multiple entries in GOPATH, with space' {
+  export GOPATH="/foo:/foo bar"
+  export GOROOT="/baz"
+  load ../../plugins/available/go.plugin
+  assert_equal "$(cut -d':' -f1,2,3 <<<$PATH)" "/foo/bin:/foo bar/bin:/baz/bin"
+}
+
+@test 'plugins go: multiple entries in GOPATH, with escaped space' {
+  export GOPATH="/foo:/foo\ bar"
+  export GOROOT="/baz"
+  load ../../plugins/available/go.plugin
+  assert_equal "$(cut -d':' -f1,2,3 <<<$PATH)" "/foo/bin:/foo\ bar/bin:/baz/bin"
+}