diff --git a/tox.ini b/tox.ini
index e35b6a45..e673c3e3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,10 +30,24 @@ commands =
   bash {toxinidir}/tools/generatelabs
   bash {toxinidir}/tools/generateslides
 
-[testenv:bashate_check]
+[testenv:bashate]
+deps = bashate
+whitelist_externals = bash
 commands =
-  # Bashate all scripts
-  bash -c "find labs/ -iname '*.sh' -print0 | xargs -0 bashate"
+         bash -c "find {toxinidir}            \
+         -not \( -type d -name .?\* -prune \) \ # prune all 'dot' dirs
+         -not \( -type d -name doc -prune \)  \ # skip docs dir
+         -type f                              \ # only files
+         -not -name \*~                       \ # skip editors, readme, etc
+         -not -name \*.md                     \
+         \(                                   \
+          -name \*.sh -or                     \
+          -name \*rc -or                      \
+          -name functions\* -or               \
+          -wholename \*/inc/\* -or            \ # /inc files and
+          -wholename \*/lib/\*                \ # /lib files are shell, but
+         \)                                   \ #  have no extension
+         -print0 | xargs -0 bashate -v"
 
 [doc8]
 # Settings for doc8: