diff --git a/.testr.conf b/.testr.conf
new file mode 100755
index 00000000..4da4d7db
--- /dev/null
+++ b/.testr.conf
@@ -0,0 +1,7 @@
+[DEFAULT]
+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 $DISCOVER_DIRECTORY $LISTOPT $IDOPTION
+test_id_option=--load-list $IDFILE
+test_list_option=--list
diff --git a/requirements.txt b/requirements.txt
index 5c235050..43fe9d39 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,3 +8,4 @@ anyjson>=0.3.3
 eventlet>=0.13.0
 kombu>=2.4.8
 six>=1.7.0
+stevedore>=0.14
diff --git a/test-requirements.txt b/test-requirements.txt
index 9885f518..741cb107 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,17 +2,7 @@ hacking>=0.8.0,<0.9
 
 unittest2
 coverage>=3.6
-fixtures>=0.3.14
-mox>=0.5.3
-nose
-nose-exclude
-openstack.nose_plugin>=0.7
-nosehtmloutput>=0.0.3
+discover
 sphinx>=1.1.2
-requests>=1.1
 testtools>=0.9.32
-mock>=1.0
-
-# Optional packages that should be installed when testing
-xattr>=0.4
-pysendfile==2.0.0
+testrepository>=0.0.18
diff --git a/tox.ini b/tox.ini
index b71b05dd..7a3f1160 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,14 +5,14 @@ skipsdist = True
 
 [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
+usedevelop = True
+install_command = pip install {opts} {packages}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands = nosetests
+commands =
+  python setup.py testr --slowest --testr-args='{posargs}'
+
+whitelist_externals = bash
 
 [testenv:pep8]
 commands =
@@ -23,7 +23,7 @@ commands =
 commands = {posargs}
 
 [testenv:cover]
-commands = nosetests --cover-erase --cover-package=muranoagent --with-xcoverage
+commands = python setup.py testr --coverage --testr-args='{posargs}'
 
 [testenv:docs]
 commands = python setup.py build_sphinx