diff --git a/.coveragerc b/.coveragerc
index 690b79b5b..f4ab5c6ff 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,7 +1,7 @@
 [run]
 branch = True
 source = openstack
-omit = openstack/tests/*,openstack/openstack/*
+omit = openstack/tests/*
 
 [report]
 ignore_errors = True
diff --git a/tox.ini b/tox.ini
index 775570797..0ad0ddb5e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -38,7 +38,7 @@ commands = {posargs}
 ; If this fails for you, you may be running an old version of tox.
 ; Run 'pip install tox' to install a newer version of tox.
 [testenv:cover]
-commands = python setup.py testr --coverage --coverage-package-name=openstack --testr-args='{posargs}'
+commands = python setup.py test --coverage --coverage-package-name=openstack --testr-args='{posargs}'
 
 [testenv:docs]
 commands = python setup.py build_sphinx