diff --git a/.travis.yml b/.travis.yml
index 28d0ca0..8fbba3e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,10 @@ python:
   - 3.5
 
 install:
-  - pip install coveralls -e .
+  - pip install coveralls flake8 -e .
+
+before_script:
+  - flake8 --ignore=E501 mattermost_gitlab tests
 
 script:
   - coverage run --source=mattermost_gitlab,tests tests/test.py
diff --git a/tox.ini b/tox.ini
index a205bec..07ee9b9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,12 +7,13 @@
 [tox]
 minversion=1.8.0
 envlist =
-    py27,
-    py33,
-    py34,
-    py35,
+    {py27,py33,py34,py35}-test
+    {py27,py35}-flake8
 
 [testenv]
-commands = coverage run --source=mattermost_gitlab,tests tests/test.py
+commands =
+    test: coverage run --source=mattermost_gitlab,tests tests/test.py
+    flake8: flake8 --ignore=E501 mattermost_gitlab tests
 deps =
-    coverage
+    test: coverage
+    flake8: flake8>=2.0,<3.0