diff --git a/tox.ini b/tox.ini
index f2fbcce206..87151c9801 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = pep8
+envlist = linters
 skipsdist = True
 
 [testenv]
@@ -8,6 +8,11 @@ usedevelop = True
 install_command = pip install {opts} {packages}
 deps = -r{toxinidir}/test-requirements.txt
 
+[testenv:linters]
+commands =
+  flake8
+  {toxinidir}/tools/run-bashate.sh
+
 [testenv:pep8]
 commands = flake8