diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 0000000..b9f25c0
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,8 @@
+[run]
+source = names
+branch = 1
+
+[report]
+exclude_lines =
+    # Don't measure coverage of cli-only code
+    if __name__ == "__main__":
diff --git a/.gitignore b/.gitignore
index d2d6f36..1853a5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ pip-log.txt
 
 # Unit test / coverage reports
 .coverage
+htmlcov
 .tox
 nosetests.xml
 
diff --git a/.travis.yml b/.travis.yml
index 65af632..9a4c40a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,6 @@ python:
 install:
   - pip install coverage coveralls --use-mirrors
 
-script: coverage run --branch --source=names setup.py test
+script: coverage run setup.py test
 
 after_success: coveralls
diff --git a/runtests.sh b/runtests.sh
new file mode 100755
index 0000000..e6f8430
--- /dev/null
+++ b/runtests.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+coverage erase
+tox
+coverage html
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..2900456
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,11 @@
+[tox]
+envlist =
+    py27,
+    py32,
+    py33
+
+
+[testenv]
+deps =
+    coverage == 3.6
+commands = coverage run -a setup.py test