diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 00000000..a9b13905
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,9 @@
+- project:
+    check:
+      jobs:
+        - openstack-tox-pep8
+        - openstack-tox-py27
+    gate:
+      jobs:
+        - openstack-tox-pep8
+        - openstack-tox-py27
diff --git a/tox.ini b/tox.ini
index 587d32eb..26370236 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,14 +21,12 @@ whitelist_externals =
   bash
   find
 
-[testenv:bandit]
-deps = .[bandit]
-commands = bandit-baseline -r orm -n5 -c bandit.yaml
-
 [testenv:pep8]
+deps =
+  -r{toxinidir}/test-requirements.txt
 commands =
   flake8 {posargs}
-  {[testenv:bandit]commands}
+  bandit-baseline -r orm -n 5 -c bandit.yaml
 
 [testenv:venv]
 commands = {posargs}