diff --git a/tox.ini b/tox.ini
index 42bb92c9..875ee90e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,4 +1,6 @@
 [tox]
+minversion = 2.3.1
+skipsdist = True
 envlist = py{35,27},py{35,27}-{postgresql},functional,cover,pep8,bandit,docs
 
 [testenv]
@@ -74,9 +76,7 @@ commands =
   coverage report
 
 [testenv:bandit]
-whitelist_externals = bandit
-commands =
-    bandit -r deckhand -x deckhand/tests -n 5
+commands = bandit -r deckhand -x deckhand/tests -n 5
 
 [testenv:genconfig]
 commands = oslo-config-generator --config-file=etc/deckhand/config-generator.conf
@@ -85,7 +85,14 @@ commands = oslo-config-generator --config-file=etc/deckhand/config-generator.con
 commands = oslopolicy-sample-generator --config-file=etc/deckhand/policy-generator.conf
 
 [testenv:pep8]
-commands = flake8 {posargs}
+deps =
+  .[bandit]
+  {[testenv]deps}
+commands =
+  flake8 {posargs}
+  # Run security linter as part of the pep8 gate instead of using separate job.
+  bandit -r deckhand -x deckhand/tests -n 5
+
 
 [flake8]
 # [H106] Don’t put vim configuration in source files.