diff --git a/.travis.yml b/.travis.yml
index 1cada115eebe1de52860fab818174d634dced1ad..50309b092b914990559da08f4e295b5beb69910f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,10 @@ python:
 
 install: 
   - python setup.py install
+  - pip install pytest-pep8 pytest-cov coveralls
 
 script: 
-  - python setup.py test
+  - py.test --pep8 mwclient -v --cov mwclient tests
+
+after_success:
+  - coveralls
diff --git a/README.rst b/README.rst
index d7fed470d19dae6bc1c3d2d5792cf09f3407b3ee..ef435037d522bfdecfbc06e1093bbbb3697e1819 100644
--- a/README.rst
+++ b/README.rst
@@ -1,14 +1,24 @@
 
-.. image:: http://img.shields.io/travis/mwclient/mwclient.svg?style=flat
+.. image:: http://img.shields.io/travis/mwclient/mwclient.svg
    :target: https://travis-ci.org/mwclient/mwclient
+   :alt: Build status
 
-.. image:: http://img.shields.io/pypi/v/mwclient.svg?style=flat
+.. image:: http://img.shields.io/coveralls/mwclient/mwclient.svg
+   :target: https://coveralls.io/r/mwclient/mwclient
+   :alt: Test coverage
+
+.. image:: http://img.shields.io/pypi/v/mwclient.svg
    :target: https://pypi.python.org/pypi/mwclient
+   :alt: Latest version
 
-.. image:: http://img.shields.io/pypi/dw/mwclient.svg?style=flat
+.. image:: http://img.shields.io/pypi/dw/mwclient.svg
    :target: https://pypi.python.org/pypi/mwclient
+   :alt: Downloads
+
+.. image:: https://img.shields.io/github/license/mwclient/mwclient.svg
+   :target: http://opensource.org/licenses/MIT
+   :alt: MIT license
 
-   
 mwclient
 ========