diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b9be7ba..e621b7f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,3 +7,8 @@
 django19:
   script:
   - tox -e py27-django19
+
+pep8:
+  script:
+  - tox -e pep8
+  allow_failure: true
diff --git a/tox.ini b/tox.ini
index 30e8c52..37cfdee 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27-django{18,19}
+envlist = py27-django{18,19},pep8
 
 [base]
 deps =
@@ -60,3 +60,16 @@
     # Install mailman.client from local repo instead of from pypi
     pip install -e ../mailman.client
     django-admin.py test --settings=testing.test_settings {posargs:postorius}
+
+[testenv:pep8]
+basepython = python2.7
+deps =
+    {[base]deps}
+    flake8
+commands =
+    flake8 {posargs}
+
+[flake8]
+ignore =
+show-source = True
+exclude = .git,.tox,dist,*egg,testing,src/postorius/doc