diff --git a/.travis.yml b/.travis.yml
index 832d2990285..6009a7c98f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,11 +2,13 @@ language: python
 python:
  - "2.7"
 install:
- - pip install flake8 stripe
+ - pip install pep8 --quiet
+ - pip install stripe
  - pip install -r requirements.txt
  - pip install coveralls
+before_script:
+ - pep8 readthedocs/
 script:
- #- flake8 `find . -iname "*.py" -not -ipath "*migration*"`
  - ./runtests.sh
 after_success:
  - coveralls
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000000..d53e1fac01d
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,2 @@
+[pep8]
+exclude = readthedocs/api,readthedocs/betterversion,readthedocs/bookmarks,readthedocs/builds,readthedocs/comments,readthedocs/core,readthedocs/djangome,readthedocs/doc_builder,readthedocs/donate,readthedocs/gold,readthedocs/locale,readthedocs/oauth,readthedocs/privacy,readthedocs/profiles,readthedocs/projects,readthedocs/redirects,readthedocs/restapi,readthedocs/rtd_tests,readthedocs/search,readthedocs/settings,readthedocs/tastyapi,readthedocs/templates,readthedocs/vcs_support,readthedocs/urls.py,readthedocs/wsgi.py