diff --git a/.coveragerc b/.coveragerc
index 88cb660bbb..4625b8853f 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,7 +1,7 @@
 [run]
 branch = True
-source = heat
-omit = heat/tests/*,heat/openstack/*
+source = heat,contrib
+omit = */tests/*,heat/openstack/*
 
 [report]
 ignore-errors = True
diff --git a/.testr.conf b/.testr.conf
index fd6e92bee2..77a8e1bd95 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -1,6 +1,7 @@
 [DEFAULT]
 test_command=
-    ${PYTHON:-python} -m subunit.run discover -s . $LISTOPT $IDOPTION
-    ${PYTHON:-python} -m subunit.run discover -s contrib $LISTOPT $IDOPTION
+    PYTHON=$(echo ${PYTHON:-python} | sed 's/--source heat//g')
+    ${PYTHON} -m subunit.run discover -s . $LISTOPT $IDOPTION
+    ${PYTHON} -m subunit.run discover -s contrib $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list