diff --git a/eris/tools.py b/eris/tools.py
index 024088b..e92dc1e 100755
--- a/eris/tools.py
+++ b/eris/tools.py
@@ -468,13 +468,13 @@ def svglib(path):
     return Status.normal, _image_to_text(image)
 
 
-@deps(deps={"go/github.com/golang/go/src/cmd/godoc"},
-      url="https://github.com/golang/go", executables={"godoc"})
+@deps(deps={"golang-go"},
+      url="https://github.com/golang/go", executables={"go"})
 def godoc(path):
     with tempfile.TemporaryDirectory() as temp_dir:
         symlink_path = os.path.join(temp_dir, "file.go")
         os.symlink(os.path.abspath(path), symlink_path)
-        stdout, stderr, returncode = _do_command(["godoc", "."], cwd=temp_dir)
+        stdout, stderr, returncode = _do_command(["go", "doc", "."], cwd=temp_dir)
         os.remove(symlink_path)
     return Status.normal, stdout
 
diff --git a/eris/tools.toml b/eris/tools.toml
index 40e0566..1f96d01 100644
--- a/eris/tools.toml
+++ b/eris/tools.toml
@@ -278,9 +278,9 @@ tools_for_extensions = [
   has_color = true
 
 [go_vet]
-  dependencies = ["go/github.com/golang/go/src/cmd/vet"]
+  dependencies = ["golang-go"]
   url = "https://github.com/golang/go"
-  command = "vet"
+  command = "go vet"
 
 [golint]
   dependencies = ["go/golang.org/x/lint/golint"]
diff --git a/tests/golden-files/results/contents-hi3_py b/tests/golden-files/results/contents-hi3_py
index 22b593e..9e9eed2 100644
--- a/tests/golden-files/results/contents-hi3_py
+++ b/tests/golden-files/results/contents-hi3_py
@@ -1,2 +1,2 @@
 [m[38;2;106;184;37m[48;2;32;32;32m[1mdef[m[38;2;208;208;208m[48;2;32;32;32m [m[38;2;68;127;207m[48;2;32;32;32mhi[m[38;2;208;208;208m[48;2;32;32;32m():[m[38;2;255;255;255m[48;2;32;32;32m      [m[38;2;255;255;255m[48;2;0;0;0m
-[m[38;2;208;208;208m[48;2;32;32;32m    [m[38;2;106;184;37m[48;2;32;32;32m[1mprint[m[38;2;208;208;208m[48;2;32;32;32m([m[38;2;237;157;19m[48;2;32;32;32m"hi"[m[38;2;208;208;208m[48;2;32;32;32m)[m
\ No newline at end of file
+[m[38;2;208;208;208m[48;2;32;32;32m    [m[38;2;36;144;157m[48;2;32;32;32mprint[m[38;2;208;208;208m[48;2;32;32;32m([m[38;2;237;157;19m[48;2;32;32;32m"hi"[m[38;2;208;208;208m[48;2;32;32;32m)[m
\ No newline at end of file