diff --git a/tox.ini b/tox.ini
index 613e0a41c99fdd15fdf13667cee97420f2aeb823..98ad95b52afe4a00cf54da5fedc6e7056a9cb27a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,16 @@
 [tox]
 minversion = 1.6
-envlist = pep8,jjb,jenkins-project,zuul
+envlist = linters,jjb,jenkins-project,zuul
 skipsdist = True
 
 [testenv]
 deps = -r{toxinidir}/test-requirements.txt
 
+[testenv:linters]
+commands =
+  flake8
+  {toxinidir}/tools/run-bashate.sh
+
 [testenv:pep8]
 commands =
   flake8