diff --git a/tox.ini b/tox.ini
index 21a609d..e0f1ebc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,36 +1,30 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = docs,pep8,ansible-syntax,ansible-lint,functional
+envlist = docs,linters,functional
 
 [testenv]
 usedevelop = True
 install_command = pip install -U {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/test-requirements.txt
-commands =
-    /usr/bin/find . -type f -name "*.pyc" -delete
-    ansible-galaxy install \
-                   --role-file=ansible-role-requirements.yml \
-                   --ignore-errors \
-                   --force
+commands = /usr/bin/find . -type f -name "*.pyc" -delete
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+commands=
+    python setup.py build_sphinx
 
 # environment used by the -infra templated docs job
 [testenv:venv]
 deps = -r{toxinidir}/test-requirements.txt
 commands = {posargs}
 
-# Run various lint checks
 [testenv:pep8]
 deps =
-    bashate
     flake8
 whitelist_externals = bash
-# Run hacking/flake8 check for all python files
 commands =
+    # Run hacking/flake8 check for all python files
     bash -c "grep -Irl \
         -e '!/usr/bin/env python' \
         -e '!/bin/python' \
@@ -43,26 +37,30 @@ commands =
         --exclude '*.sh' \
         {toxinidir} | xargs flake8 --verbose"
 
-# Run bashate check for all bash scripts
-# Ignores the following rules:
-#     E003: Indent not multiple of 4 (we prefer to use multiples of 2)
-    bash -c "grep -Irl \
-        -e '!/usr/bin/env bash' \
-        -e '!/bin/bash' \
-        -e '!/bin/sh' \
-        --exclude-dir '.*' \
-        --exclude-dir '*.egg' \
-        --exclude-dir '*.egg-info' \
-        --exclude 'tox.ini' \
-        {toxinidir} | xargs bashate --verbose --ignore=E003"
-
 [flake8]
 # Ignores the following rules due to how ansible modules work in general
-#     F403 'from ansible.module_utils.basic import *' used; unable to detect undefined names
+#     F403 'from ansible.module_utils.basic import *' used;
+#           unable to detect undefined names
 #     H303  No wildcard (*) import.
 ignore=F403,H303
 
+[testenv:bashate]
+deps =
+  bashate
+whitelist_externals = bash
+commands =
+  # Run bashate check for all bash scripts
+  # Ignores the following rules:
+  #     E003: Indent not multiple of 4 (we prefer to use multiples of 2)
+  bash -c "grep --recursive --binary-files=without-match \
+    --files-with-match '^.!.*\(ba\)\?sh$' \
+    --exclude-dir .tox \
+    --exclude-dir .git \
+    {toxinidir} | xargs bashate --error . --verbose --ignore=E003"
+
 [testenv:ansible-syntax]
+deps =
+  ansible>1.9,<2.0
 changedir = tests
 commands =
     ansible-galaxy install \
@@ -76,6 +74,9 @@ commands =
                      test.yml
 
 [testenv:ansible-lint]
+deps =
+  ansible>1.9,<2.0
+  ansible-lint
 changedir = tests
 commands =
     ansible-galaxy install \
@@ -94,3 +95,17 @@ commands =
     ansible-playbook -i inventory \
                      -e "rolename={toxinidir}" \
                      test.yml
+
+[testenv:linters]
+deps =
+  {[testenv:pep8]deps}
+  {[testenv:bashate]deps}
+  {[testenv:ansible-lint]deps}
+  # note that the ansible-syntax deps are omitted on purpose as the
+  #  ansible-lint env contains duplicate items in its dep list
+whitelist_externals = bash
+commands =
+  {[testenv:pep8]commands}
+  {[testenv:bashate]commands}
+  {[testenv:ansible-lint]commands}
+  {[testenv:ansible-syntax]commands}