diff --git a/test-requirements.txt b/test-requirements.txt
index c43dfd1e..de77c7b5 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,3 +7,4 @@ pbr>=0.6,<1.0
 oslosphinx
 sphinx>=1.1.2,<1.2
 hieroglyph>=0.5
+bashate # pep8 equivalent for bash scripts
diff --git a/tox.ini b/tox.ini
index 13f948bb..62266c79 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,6 +29,11 @@ commands =
   # Build training labs scripts
   bash {toxinidir}/tools/generatelabs
 
+[testenv:bashate_check]
+commands =
+  # Bashate all scripts
+  bash -c "find labs/ -iname '*.sh' -print0 | xargs -0 bashate"
+
 [doc8]
 # Settings for doc8:
 # File extensions to use