diff --git a/.travis.yml b/.travis.yml
index 1043431..cf7e039 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,6 @@ install:
 script:
   - tox -e $TOX_ENV
 after_success:
-  - coveralls
+  - if [ "$TOX_ENV" = "cover" ]; then coveralls; fi
 notifications:
   email: false
diff --git a/bin/generate_travis_yml.py b/bin/generate_travis_yml.py
index ada5ae9..9a4e752 100644
--- a/bin/generate_travis_yml.py
+++ b/bin/generate_travis_yml.py
@@ -14,6 +14,6 @@ print("  - pip install python-coveralls")
 print("script:")
 print("  - tox -e $TOX_ENV")
 print("after_success:")
-print("  - coveralls")
+print('  - if [ "$TOX_ENV" = "cover" ]; then coveralls; fi')
 print("notifications:")
 print("  email: false")
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index c09f72c..804cf0f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -53,7 +53,8 @@ basepython = python3.4
 deps =
     {[testenv]deps}
     pylint
-commands = - pylint minecraft -f colorized -d all -e W -r n
+commands =
+    - pylint minecraft -f colorized -d all -e W -r n
 
 [testenv:pylint-full]
 basepython = python3.4