diff --git a/.gitignore b/.gitignore
index 40ba2ee..6cc2a80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,9 +71,9 @@ coverage.xml
 ostro-daemon.pid
 .project
 .pydevproject
-.testrepository
 .settings
 .settings/
+.stestr
 
 # Translations
 *.mo
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..9f39eae
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./valet/tests/unit
+top_dir=.
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index ba78ba2..0000000
--- a/.testr.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
-             OS_STDERR_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
-             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-1000} \
-             ${PYTHON:-python} -m subunit.run discover ${OS_TEST_PATH:-./valet/tests/unit} -t . $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/tox.ini b/tox.ini
index c48ff11..8cf3e39 100644
--- a/tox.ini
+++ b/tox.ini
@@ -39,14 +39,15 @@ commands = python setup.py testr --slowest --testr-args='{posargs}'
 [testenv:cover]
 # Do NOT run test_coverage_ext tests while gathering coverage.
 # Those tests conflict with coverage.
-setenv = VIRTUAL_ENV={envdir}
-         OS_TEST_PATH=valet/tests/unit
+setenv =
+    {[testenv]setenv}
+    PYTHON=coverage run --source valet --parallel-mode
 commands =
-    coverage erase
     find . -type f -name "*.pyc" -delete
-    python setup.py test --slowest --coverage --coverage-package-name 'valet' --testr-args='{posargs}'
-    coverage html
-    coverage report
+    stestr run {posargs}
+    coverage combine
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
 
 [testenv:docs]
 commands = python setup.py build_sphinx