diff --git a/.gitignore b/.gitignore
index e8c4c0c0ec..9d37835267 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,8 @@ quantum/versioninfo
 run_tests.err.log
 run_tests.log
 setuptools*.egg/
+subunit.log
+.testrepository
 .tox/
 .venv/
 *.mo
diff --git a/.testr.conf b/.testr.conf
new file mode 100644
index 0000000000..9339183aa0
--- /dev/null
+++ b/.testr.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+test_command=${PYTHON:-python} -m subunit.run discover -t ./ quantum/tests/unit $LISTOPT $IDOPTION
+test_id_option=--load-list $IDFILE
+test_list_option=--list
diff --git a/tools/test-requires b/tools/test-requires
index d86688ea4a..aa85c1bf8b 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -1,6 +1,7 @@
 Babel>=0.9.6
 cliff
-coverage
+coverage>=3.6
+discover
 distribute>=0.6.24
 fixtures>=0.3.12
 mock>=1.0b1
@@ -10,7 +11,9 @@ nosehtmloutput
 nosexcover
 openstack.nose_plugin
 pep8
+python-subunit
 sphinx>=1.1.2
+testrepository>=0.0.13
 testtools>=0.9.27
 webtest==1.3.3
 # Packages for the Cisco Plugin