diff --git a/test-requirements.txt b/test-requirements.txt
index 21a7e3b70..8f183e770 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,6 +4,7 @@
 
 hacking<0.11,>=0.10.0
 
+ansible-lint
 coverage>=3.6
 python-subunit>=0.0.18
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
diff --git a/tox.ini b/tox.ini
index 890a7d066..5c5cc1355 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,6 +18,13 @@ commands = python setup.py test
 [testenv:common-constraints]
 install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
 
+[testenv:linters]
+whitelist_externals = bash
+commands =
+  flake8
+  bash -c "cd ansible; find . -type f -regex '.*.y[a]?ml' -print0 | xargs -t -n1 -0 \
+    ansible-lint"
+
 [testenv:pep8]
 commands = flake8 {posargs} --exclude=ansible