diff --git a/test-requirements.txt b/test-requirements.txt
index d6676fe7..5d53074a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,6 +4,7 @@
 
 hacking>=0.12.0,<0.13 # Apache-2.0
 
+ansible-lint
 bashate>=0.2
 sphinx>=1.5.1,<1.6.0 # BSD
 oslosphinx>=4.7.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 9046fc4d..7afd70be 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,7 +21,11 @@ commands = bindep test
 commands = python setup.py build_sphinx
 
 [testenv:pep8]
-commands = flake8 {posargs}
+whitelist_externals = bash
+commands =
+  flake8 {posargs}
+  bash -c "cd playbooks; find . -type f -regex '.*.y[a]?ml' -print0 | xargs -t -n1 -0 \
+    ansible-lint"
 
 [testenv:venv]
 commands = {posargs}