diff --git a/tools/lintstack.py b/tools/lintstack.py
index 91d7b83513..2613a7e976 100755
--- a/tools/lintstack.py
+++ b/tools/lintstack.py
@@ -151,6 +151,25 @@ def generate_error_keys(msg=None):
         ErrorKeys.print_json(errors, output=f)
 
 
+def check():
+    print("Running pylint. Be patient...")
+    newmsg = run_pylint()
+    errors = LintOutput.from_msg_to_dict(newmsg)
+
+    passed = True
+    for err_key, err_list in errors.items():
+        for err in err_list:
+            print(err.review_str() + "\n")
+            passed = False
+
+    if passed:
+        print("Congrats! pylint check passed.")
+    else:
+        print("\nPlease fix the errors above. If you believe they are false "
+              "positives, run 'tools/lintstack.py generate' to overwrite.")
+        sys.exit(1)
+
+
 def validate(newmsg=None):
     print("Loading", KNOWN_PYLINT_EXCEPTIONS_FILE)
     known = ErrorKeys.from_file(KNOWN_PYLINT_EXCEPTIONS_FILE)
@@ -197,6 +216,8 @@ def main():
         generate_error_keys()
     elif option == "validate":
         validate()
+    elif option == "check":
+        check()
     else:
         usage()
 
diff --git a/tox.ini b/tox.ini
index 2e57c15325..8901d3187a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -50,6 +50,11 @@ deps = -r{toxinidir}/requirements.txt
 whitelist_externals = bash
 commands = bash tools/lintstack.sh
 
+[testenv:lint]
+deps = -r{toxinidir}/requirements.txt
+       pylint==0.26.0
+commands = python tools/lintstack.py check
+
 [flake8]
 # Following checks are ignored on purpose:
 #