diff --git a/doc/ext/nova_autodoc.py b/doc/ext/cinder_autodoc.py
similarity index 100%
rename from doc/ext/nova_autodoc.py
rename to doc/ext/cinder_autodoc.py
diff --git a/doc/ext/nova_todo.py b/doc/ext/cinder_todo.py
similarity index 100%
rename from doc/ext/nova_todo.py
rename to doc/ext/cinder_todo.py
diff --git a/run_tests.sh b/run_tests.sh
index 74fb69b28b4..c08eb6a345f 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -39,6 +39,7 @@ function process_option {
     -p|--pep8) just_pep8=1;;
     -P|--no-pep8) no_pep8=1;;
     -c|--coverage) coverage=1;;
+    -x|--coverage-xml) coverage_xml=1;;
     -*) noseopts="$noseopts $1";;
     *) noseargs="$noseargs $1"
   esac
@@ -57,6 +58,7 @@ wrapper=""
 just_pep8=0
 no_pep8=0
 coverage=0
+coverage_xml=0
 recreate_db=1
 patch_migrate=1
 
@@ -68,6 +70,9 @@ done
 if [ $coverage -eq 1 ]; then
     noseopts="$noseopts --with-coverage --cover-package=cinder"
 fi
+if [ $coverage_xml -eq 1 ]; then
+    noseopts="$noseopts --with-xcoverage --cover-package=cinder --xcoverage-file=`pwd`/coverage.xml"
+fi
 
 if [ $no_site_packages -eq 1 ]; then
   installvenvopts="--no-site-packages"
diff --git a/setup.cfg b/setup.cfg
index 4ecc13d9c77..3f72e16c787 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,10 +23,8 @@ mapping_file = babel.cfg
 output_file = cinder/locale/cinder.pot
 
 [nosetests]
+cover-package = cinder
+cover-erase = true
+cover-inclusive = true
 verbosity=2
 detailed-errors=1
-with-openstack=1
-openstack-red=0.05
-openstack-yellow=0.025
-openstack-show-elapsed=1
-openstack-color=1
diff --git a/tox.ini b/tox.ini
index ad8f449eff0..84cbb975a85 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,9 +4,13 @@ envlist = py26,py27,pep8
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
          NOSE_WITH_OPENSTACK=1
+         NOSE_OPENSTACK_COLOR=1
+         NOSE_OPENSTACK_RED=0.05
+         NOSE_OPENSTACK_YELLOW=0.025
+         NOSE_OPENSTACK_SHOW_ELAPSED=1
 deps = -r{toxinidir}/tools/pip-requires
        -r{toxinidir}/tools/test-requires
-commands = /bin/bash run_tests.sh -N -P
+commands = /bin/bash run_tests.sh -N -P {posargs}
 
 [testenv:pep8]
 deps = pep8
@@ -16,7 +20,7 @@ commands = pep8 --repeat --show-source cinder setup.py
 commands = {posargs}
 
 [testenv:cover]
-commands = /bin/bash run_tests.sh -N -P --coverage
+commands = /bin/bash run_tests.sh -N -P --coverage-xml
 
 [tox:jenkins]
 downloadcache = ~/cache/pip
@@ -24,19 +28,15 @@ downloadcache = ~/cache/pip
 [testenv:jenkins26]
 basepython = python2.6
 setenv = NOSE_WITH_XUNIT=1
-deps = file://{toxinidir}/.cache.bundle
 
 [testenv:jenkins27]
 basepython = python2.7
 setenv = NOSE_WITH_XUNIT=1
-deps = file://{toxinidir}/.cache.bundle
 
 [testenv:jenkinscover]
-deps = file://{toxinidir}/.cache.bundle
 setenv = NOSE_WITH_XUNIT=1
-commands = /bin/bash run_tests.sh -N --coverage
+commands = /bin/bash run_tests.sh -N --coverage-xml
 
 [testenv:jenkinsvenv]
-deps = file://{toxinidir}/.cache.bundle
 setenv = NOSE_WITH_XUNIT=1
 commands = {posargs}