diff --git a/.gitignore b/.gitignore
index 9593e4319d..2222057f00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,8 +29,6 @@ keys
 local_settings.py
 subunit.log
 tools/conf/manila.conf*
-tools/lintstack.head.py
-tools/pylint_exceptions
 tags
 # Files created by Sphinx build
 doc/build
diff --git a/tox.ini b/tox.ini
index 2e43889564..431a7b660f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -109,12 +109,6 @@ deps = -r{toxinidir}/requirements.txt
 whitelist_externals = bash
 commands = bash ./tools/coding-checks.sh --pylint {posargs}
 
-[testenv:lint]
-basepython = python3
-deps = -r{toxinidir}/requirements.txt
-       pylint==1.9.0
-commands = python tools/lintstack.py check
-
 [testenv:api-ref]
 basepython = python3
 # This environment is called from CI scripts to test and publish