diff --git a/.zuul.yaml b/.zuul.yaml
index 3e152cf0..3906ecde 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -13,15 +13,15 @@
 - project:
     check:
       jobs:
+        - openstack-tox-pep8
         - airship-shipyard-linter
         - airship-shipyard-ubuntu:
             voting: false
         - airship-shipyard-tox-py35
-        - airship-shipyard-pep8
-        - airship-shipyard-security-bandit
         - airship-shipyard-image
     gate:
       jobs:
+        - openstack-tox-pep8
         - airship-shipyard-linter
         # NOTE(portdirect): enable when voting enabled.
         # - airship-shipyard-ubuntu:
@@ -30,8 +30,6 @@
         #       - ^doc/.*$
         #       - ^releasenotes/.*$
         - airship-shipyard-tox-py35
-        - airship-shipyard-pep8
-        - airship-shipyard-security-bandit
         - airship-shipyard-image
     post:
       jobs:
@@ -103,23 +101,6 @@
     vars:
       tox_envlist: py35
 
-- job:
-    name: airship-shipyard-pep8
-    description: |
-      Run pep8 tests for the Airship Shipyard project under
-      cPython version 3.5.
-    parent: airship-shipyard-tox-base
-    nodeset: airship-shipyard-single-node
-    vars:
-      tox_envlist: pep8
-
-- job:
-    name: airship-shipyard-security-bandit
-    description: |
-      Run bandit code scans for the Airship Shipyard project
-    run: tools/gate/playbooks/security-bandit.yaml
-    nodeset: airship-shipyard-single-node
-
 - job:
     name: airship-shipyard-image-base
     description: |
diff --git a/src/bin/shipyard_airflow/test-requirements.txt b/src/bin/shipyard_airflow/test-requirements.txt
index 89d52046..26d0531d 100644
--- a/src/bin/shipyard_airflow/test-requirements.txt
+++ b/src/bin/shipyard_airflow/test-requirements.txt
@@ -18,4 +18,4 @@ git+https://github.com/att-comdev/promenade.git@master#egg=promenade
 flake8==3.3.0
 
 # Security scanning
-bandit>=1.1.0 # Apache-2.0
+bandit>=1.5.0 # Apache-2.0
diff --git a/src/bin/shipyard_airflow/tox.ini b/src/bin/shipyard_airflow/tox.ini
index 760c1eec..41e2e503 100644
--- a/src/bin/shipyard_airflow/tox.ini
+++ b/src/bin/shipyard_airflow/tox.ini
@@ -31,15 +31,18 @@ commands =
 
 [testenv:pep8]
 basepython=python3
-commands = flake8 {posargs}
+deps=
+    flake8==3.3.0
+    bandit>=1.5.0
+commands =
+    flake8 {toxinidir}/shipyard_airflow
+    bandit -r shipyard_airflow
 
 [testenv:bandit]
-skipsdist=True
 basepython=python3
+skipsdist= True
 commands =
-  bandit \
-  -r shipyard_airflow \
-  -n 5
+  bandit -r shipyard_airflow -n 5
 
 [testenv:genconfig]
 commands = oslo-config-generator --config-file=generator/config-generator.conf
diff --git a/src/bin/shipyard_client/tox.ini b/src/bin/shipyard_client/tox.ini
index e07b9bc1..d00fe3e3 100644
--- a/src/bin/shipyard_client/tox.ini
+++ b/src/bin/shipyard_client/tox.ini
@@ -32,15 +32,18 @@ commands =
 
 [testenv:pep8]
 basepython=python3
-commands = flake8 {posargs}
+deps=
+    flake8==3.3.0
+    bandit>=1.5.0
+commands =
+    flake8 {toxinidir}/shipyard_airflow
+    bandit -r shipyard_airflow
 
 [testenv:bandit]
 basepython=python3
 skipsdist=True
 commands =
-  bandit \
-  -r shipyard_client \
-  -n 5
+  bandit -r shipyard_client -n 5
 
 [flake8]
 filename = *.py