diff --git a/.travis.yml b/.travis.yml
index b79a7e2..60c90c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,10 +3,8 @@ python:
   - "2.7"
 install:
   - pip install -r test_requirements.txt --use-mirror
-  - pip install pep8 --use-mirrors
-  - pip install pyflakes --use-mirrors
+  - pip install flake8 --use-mirrors
   - pip install -q . --use-mirrors
 before_script:
-  - pep8 --repeat --show-source --ignore=E125 --statistics --exclude=dist,doc,*egg .
-  - pyflakes akanda
+  - flake8 setup.py akanda
 script: nosetests -d
\ No newline at end of file
diff --git a/akanda/router/api/v1/__init__.py b/akanda/router/api/v1/__init__.py
index f62eb87..bcf4b12 100644
--- a/akanda/router/api/v1/__init__.py
+++ b/akanda/router/api/v1/__init__.py
@@ -1,3 +1,4 @@
+# flake8: noqa
 import base
 import firewall
 import system
diff --git a/tox.ini b/tox.ini
index 3d5f8c1..6d3f2b5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,pep8,pyflakes
+envlist = py27,pep8,style
 
 [testenv]
 deps = -r{toxinidir}/test_requirements.txt
@@ -18,7 +18,12 @@ setenv = NOSE_WITH_COVERAGE=1
 [testenv:venv]
 commands = {posargs}
 
-[testenv:pyflakes]
-deps = pyflakes
-commands = pyflakes akanda
+[testenv:style]
+deps = flake8
+commands = flake8 setup.py akanda
 
+[flake8]
+show-source = True
+exclude = .tox,dist,doc,*.egg,build
+ignore = E125
+builtins = _