diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 000000000..1190c5e21
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,7 @@
+[run]
+branch = True
+source = oslo_messaging
+omit = oslo_messaging/tests/*,oslo_messaging/openstack/*
+
+[report]
+ignore-errors = True
diff --git a/tox.ini b/tox.ini
index 5cbe26086..c01a8d025 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ commands = flake8
 [testenv:cover]
 setenv = VIRTUAL_ENV={envdir}
 commands =
-  python setup.py testr --coverage
+  python setup.py test --coverage --coverage-package-name=oslo_messaging --testr-args='{posargs}'
 
 [testenv:venv]
 commands = {posargs}