diff --git a/pylintrc b/pylintrc
index 337311daa1..cdfd48653f 100644
--- a/pylintrc
+++ b/pylintrc
@@ -14,6 +14,7 @@
 disable=all
 enable=
         cyclic-import,
+        import-error,
         import-self,
         misplaced-future,
         missing-final-newline,
diff --git a/setup.py b/setup.py
index 1c25b9cd7d..bef5c31faa 100755
--- a/setup.py
+++ b/setup.py
@@ -606,21 +606,6 @@ def run(self):
 		])
 
 
-class lint(Command):
-	""" run lint """
-
-	user_options = []
-
-	def initialize_options(self):
-		pass
-
-	def finalize_options(self):
-		pass
-
-	def run(self):
-		subprocess.check_call(['pylint', 'lib'])
-
-
 def find_packages():
 	for dirpath, _dirnames, filenames in os.walk('lib'):
 		if '__init__.py' in filenames:
@@ -721,7 +706,6 @@ def run(self):
 		'install_scripts_sbin': x_install_scripts_sbin,
 		'sdist': x_sdist,
 		'test': test,
-		'lint': lint,
 	},
 
 	classifiers = [
diff --git a/tox.ini b/tox.ini
index 7497f46605..d6c8cf3b3a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,6 +11,6 @@ deps =
 setenv =
 	PYTHONPATH={toxinidir}/lib
 commands =
-	python -b -Wd setup.py lint
+	bash -c 'rm -rf build && PYTHONPATH=$PWD/lib:$PWD/repoman/lib pylint *'
 	python -b -Wd setup.py test
 	python -b -Wd repoman/setup.py test