--- a/.travis.yml
+++ b/.travis.yml
@@ -3,16 +3,20 @@ python:
   - "2.7"
 
 install:
   - pip install tox
 
 script:
   - tox
 
+after_script:
+  # only in after_script can it run without failing the job
+  - tox -e pep8
+
 # currently cannot customise per user fork, see:
 # https://github.com/travis-ci/travis-ci/issues/1094
 # please comment out this section in your personal fork!
 notifications:
   irc:
     channels:
       - "irc.mozilla.org#releng"
     on_success: always

--- a/README.md
+++ b/README.md
@@ -15,21 +15,19 @@ This bug will get triaged by us.
 ### To run unit tests
 ```
 pip install tox
 tox
 ```
 
 ### To run tests in travis
 Please note if you fork this repository and wish to run the tests in travis,
-you will need to enable your github fork in both travis and coveralls. In both
-cases you can log in with your github account, you do not need to set up a new
-one. To enable:
+you will need to enable your github fork in travis. You can log in with your
+github account, you do not need to set up a new one. To enable:
 * https://travis-ci.org/profile
-* https://coveralls.io/repos/new
 
 After enabling, you will need to push changes to your repo in order for a travis
 job to be triggered.
 
 ### To match commits to upstream hg changesets
 Add this following section to the .git/config file in your local clone:
 ```
 [remote "mozilla"]

--- a/tox.ini
+++ b/tox.ini
@@ -20,14 +20,23 @@ deps =
     distribute==0.6.14
     pyOpenSSL==0.14
     pyasn1==0.0.11a
     pycrypto==2.3
     pytz==2011d
     wsgiref==0.1.2
     zope.interface==3.6.1
     MozillaPulse==0.80
-    pep8
 
 commands =
     ./tox_env.sh "{toxinidir}" "{toxworkdir}"
     ./test-masters.sh -e
+
+
+[testenv:pep8]
+# Don't fail on pep8 yet
+# Would love to enable failing this by default - See:
+# https://bitbucket.org/hpk42/tox/issue/124/ignore-command-exit-codes
+deps=
+    pep8
+    {[testenv]deps}
+commands=
     pep8 --max-line-length=159 --exclude=.svn,CVS,.bzr,.hg,.git,__pycache__,seamonkey,calendar,.tox