diff --git a/.gitignore b/.gitignore
index cf09a10..06cfb78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ premailer/gorunsettings.py
 .DS_Store
 .coverage
 .tox
+/htmlcov/
diff --git a/.travis.yml b/.travis.yml
index f84d580..4ab03d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ language: python
 before_install:
   # twine is necessary so that travis can deploy
   - travis_retry pip install twine
-  - travis_retry pip install coverage tox coveralls
+  - travis_retry pip install tox coveralls
 
 install:
   - travis_retry python setup.py install
diff --git a/README.rst b/README.rst
index a3af844..4748b91 100644
--- a/README.rst
+++ b/README.rst
@@ -282,7 +282,7 @@ maintained project please consider supporting me on
 
 .. |Travis| image:: https://travis-ci.org/peterbe/premailer.png?branch=master
    :target: https://travis-ci.org/peterbe/premailer
-.. |Coverage Status| image:: https://coveralls.io/repos/peterbe/premailer/badge.png?branch=master
-   :target: https://coveralls.io/r/peterbe/premailer?branch=master
+.. |Coverage Status| image:: https://coveralls.io/repos/peterbe/premailer/badge.svg?branch=master&service=github
+   :target: https://coveralls.io/github/peterbe/premailer?branch=master
 .. |Gratipay| image:: https://img.shields.io/gratipay/peterbe.svg
    :target: https://gratipay.com/peterbe/
diff --git a/setup.cfg b/setup.cfg
index 5b7ad24..6fbcdd6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,3 +4,5 @@
 #   across 2 and 3.
 ignore=E402
 exclude=setup.py,premailer/__init__.py
+[bdist_wheel]
+universal=1
diff --git a/tox.ini b/tox.ini
index 9c7d6da..f4f351b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ envlist = flake8, py26, py27, py32, py33, py34, pypy
 
 [testenv]
 passenv = *
-commands = nosetests
+commands = nosetests --with-coverage --cover-package=premailer
 install_command =
   pip install {opts} {packages}
 
@@ -19,15 +19,31 @@ deps =
     cssselect
     cssutils
     lxml
+    coverage
 
 [testenv:flake8]
 deps = flake8
 commands = flake8 premailer
 
+[testenv:py32]
+# Python 3.2 does not support coverage 4.x
+commands = nosetests --with-coverage --cover-package=premailer
+install_command =
+  pip install {opts} {packages}
+
+deps =
+    setuptools
+    nose
+    mock
+    cssselect
+    cssutils
+    lxml
+    coverage==3.7.1
+
 [testenv:py26]
 # Python 2.6 is missing both the ordereddict and argparse modules
 # from the standard library.
-commands = nosetests
+commands = nosetests --with-coverage --cover-package=premailer
 install_command =
   pip install {opts} {packages}
 
@@ -40,3 +56,4 @@ deps =
     lxml
     ordereddict
     argparse
+    coverage