diff --git a/vigil/tools.py b/vigil/tools.py
index 766d3f7..283cfce 100644
--- a/vigil/tools.py
+++ b/vigil/tools.py
@@ -321,9 +321,10 @@ def pydoc(path):
     return status, fill3.Text(_fix_input(stdout))
 
 
-@deps(deps={"mypy"}, url="mypy", executables={"mypy"})
+@deps(deps={"pip3/mypy"}, url="mypy", executables={"mypy"})
 def mypy(path):
-    stdout, stderr, returncode = _do_command(["mypy", path], timeout=TIMEOUT)
+    stdout, stderr, returncode = _do_command(
+        [PYTHON_EXECUTABLE, "-m", "mypy", path], timeout=TIMEOUT)
     status = Status.ok if returncode == 0 else Status.problem
     return status, fill3.Text(stdout)
 
@@ -527,7 +528,7 @@ def _resize_image(image, new_width):
                         PIL.Image.ANTIALIAS)
 
 
-@deps(deps={"python3-pil"}, url="python3-pil")
+@deps(deps={"pip3/pillow"}, url="python3-pil")
 def pil(path):
     with open(path, "rb") as image_file:
         with PIL.Image.open(image_file).convert("RGB") as image:
diff --git a/vigil/tools.toml b/vigil/tools.toml
index afe35b9..632424c 100644
--- a/vigil/tools.toml
+++ b/vigil/tools.toml
@@ -142,7 +142,7 @@ tools_for_extensions = [
   success_status = "normal"
 
 [pdf2txt]
-  dependencies = ["python-pdfminer"]
+  dependencies = ["pip/pdfminer"]
   url = "python-pdfminer"
   command = "pdf2txt"
   success_status = "normal"
@@ -233,9 +233,9 @@ tools_for_extensions = [
   command = "golint -set_exit_status"
 
 [yamllint]
-  dependencies = ["yamllint"]
+  dependencies = ["pip3/yamllint"]
   url = "yamllint"
-  command = "yamllint"
+  command = "python3.7 -m yamllint"
 
 [mediainfo]
   dependencies = ["mediainfo"]