diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 0000000..962d878
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,9 @@
+- project:
+    templates:
+      - openstack-specs-jobs
+    check:
+      jobs:
+        - openstack-tox-pep8
+    gate:
+      jobs:
+        - openstack-tox-pep8
diff --git a/requirements.txt b/requirements.txt
index 1a333f4..7355df0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,3 +2,4 @@ pbr>=0.6,<1.0
 oslosphinx>=2.2.0  # Apache-2.0
 sphinx>=1.1.2,!=1.2.0,<1.3
 yasfb>=0.5.1
+flake8
diff --git a/setup.py b/setup.py
index b476b74..769f681 100755
--- a/setup.py
+++ b/setup.py
@@ -19,4 +19,4 @@ import setuptools
 
 setuptools.setup(
     setup_requires=['pbr>=0.6,<1.0'],
-    pbr=True)
\ No newline at end of file
+    pbr=True)
diff --git a/tox.ini b/tox.ini
index 62e4415..d5b9553 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = docs
+envlist = pep8,docs
 skipsdist = True
 
 [testenv]
@@ -23,3 +23,11 @@ deps =
    sphinxcontrib-spelling
    PyEnchant
 commands = sphinx-build -b spelling doc/source doc/build/spelling
+
+[testenv:pep8]
+commands = flake8
+
+[flake8]
+show-source = True
+ignore = E123,E125,D100
+exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build