diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 00000000..423b27cb
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,7 @@
+[run]
+branch = True
+source = openstack_health
+omit = openstack_health/tests/*,test/*
+
+[report]
+ignore_errors = True
diff --git a/.gitignore b/.gitignore
index 53863ff5..570c6546 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,8 @@ lib64
 pip-log.txt
 
 # Unit test / coverage reports
-.coverage
+.coverage*
+!.coveragerc
 .tox
 nosetests.xml
 .testrepository
diff --git a/tox.ini b/tox.ini
index cdb258fa..ce804efb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,7 +26,7 @@ commands =
    flake8 {toxinidir}/openstack_health {posargs}
 
 [testenv:cover]
-commands = python setup.py testr --coverage {posargs}
+commands = python setup.py testr --coverage --coverage-package-name='openstack_health' --testr-args={posargs}
 
 [flake8]
 # E125 is a won't fix until https://github.com/jcrocholl/pep8/issues/126 is resolved.  For further detail see https://review.openstack.org/#/c/36788/