diff --git a/.gitignore b/.gitignore
index 715c9605f..cd390541e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,6 @@ AUTHORS
 ChangeLog
 templates/cloudformation-examples
 .tox
+.coverage
+cover
+.testrepository
diff --git a/tools/test-requires b/tools/test-requires
index 1d1eb0c4b..0cbb4a1e1 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -3,8 +3,8 @@ distribute>=0.6.24
 
 coverage
 mox==0.5.3
+testrepository>=0.0.13
 nose
-nosexcover
 openstack.nose_plugin>=0.7
 paramiko
 pep8==1.3.4
diff --git a/tools/test-requires-rpm b/tools/test-requires-rpm
index 9bf50802f..3874d1f79 100644
--- a/tools/test-requires-rpm
+++ b/tools/test-requires-rpm
@@ -3,8 +3,8 @@ python-setuptools
 
 python-coverage
 python-mox
+python-testrepository
 python-nose
-#nosexcover
 #openstack.nose_plugin>=0.7
 python-pep8
 python-sphinx
diff --git a/tox.ini b/tox.ini
index d877253a0..105c6a581 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,8 @@ envlist = py26,py27,pep8
 setenv = VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/tools/pip-requires
        -r{toxinidir}/tools/test-requires
-commands = nosetests -a tag='unit'
+commands =
+  python setup.py testr --slowest --testr-args='{posargs}'
 
 [testenv:pep8]
 commands = bash tools/run_pep8.sh
@@ -14,7 +15,9 @@ commands = bash tools/run_pep8.sh
 commands = {posargs}
 
 [testenv:cover]
-commands = nosetests --cover-erase --cover-package=heat --with-xcoverage -a tag='unit'
+setenv = VIRTUAL_ENV={envdir}
+commands =
+  python setup.py testr --coverage
 
 [tox:jenkins]
 downloadcache = ~/cache/pip