diff --git a/.travis.yml b/.travis.yml
index e5dd406..5c0f5be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,11 +22,8 @@ install:
 - travis_retry pip install coveralls
 script: tox
 after_success:
-- if [ $TOXENV == 'py27' ]; then pip install coveralls; coveralls; fi
-- if [ $TOXENV == 'py27' ]; then travis_retry pip install scrutinizer-ocular; ocular;
-  fi
-- if [ $TOXENV == 'py27' ]; then travis_retry pip install scrutinizer-ocular; ocular;
-  fi
+- travis_retry pip install coveralls && coveralls
+- travis_retry pip install scrutinizer-ocular && ocular
 matrix:
   allow_failures:
   - python: '3.4'
diff --git a/tests/test_pylast.py b/tests/test_pylast.py
index 8f2fe90..36f5c60 100755
--- a/tests/test_pylast.py
+++ b/tests/test_pylast.py
@@ -1908,4 +1908,6 @@ class TestPyLast(unittest.TestCase):
         self.assertEqual(str(tracks[0].track.artist), "Johnny Cash")
         self.assertEqual(str(tracks[0].track.title), "Ring of Fire")
 
-# End of file
+
+if __name__ == '__main__':
+    unittest.main(failfast=True)