diff --git a/.travis.yml b/.travis.yml
index e423675..418ca7a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,12 +4,12 @@ install:
   - pip install tox
 
 env:
-# - TOX_ENV=py26
+  - TOX_ENV=pypy
   - TOX_ENV=py27
   - TOX_ENV=py33
   - TOX_ENV=py34
 # - TOX_ENV=py35
-  - TOX_ENV=pypy
+# - TOX_ENV=flake8
 
 script:
   - tox -e $TOX_ENV
@@ -22,3 +22,7 @@ matrix:
     - python: 3.5
       env:
       - TOX_ENV=py35
+
+    - python: 3.5
+      env:
+      - TOX_ENV=flake8
diff --git a/tox.ini b/tox.ini
index 2939feb..156850d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,4 +1,23 @@
+[tox]
+envlist =
+    pypy
+    py27
+    py33
+    py34
+    py35
+    flake8
+
+
+
 [testenv]
 commands =
     scour --version
     python testscour.py
+
+
+[testenv:flake8]
+deps =
+    flake8
+
+commands =
+    flake8 --max-line-length=119
\ No newline at end of file