diff --git a/.coveragerc b/.coveragerc
index 27c6a6f..250c7e6 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,7 +1,7 @@
 [run]
 branch = True
 source = nova_solverscheduler
-omit = nova_solverscheduler/openstack/*
+omit = nova_solverscheduler/tests/*
 
 [report]
 ignore-errors = True
diff --git a/.testr.conf b/.testr.conf
index 6d83b3c..54e9c3d 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -2,6 +2,6 @@
 test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
              OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
              OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
-             ${PYTHON:-python} -m subunit.run discover -t ./ . $LISTOPT $IDOPTION
+             ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./nova_solverscheduler/tests} $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list
diff --git a/tox.ini b/tox.ini
index 412f470..ed70a75 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,7 +19,13 @@ commands = flake8
 commands = {posargs}
 
 [testenv:cover]
-commands = python setup.py test --coverage --testr-args='{posargs}'
+whitelist_externals = ln
+commands =
+  # pbr assumes that the coverage source is nova-solver-scheduler
+  # we want it to be nova_solverscheduler
+  ln -sf nova_solverscheduler nova-solver-scheduler
+  python setup.py test --coverage --testr-args='{posargs}'
+  coverage report
 
 [testenv:docs]
 commands = python setup.py build_sphinx