diff --git a/.gitignore b/.gitignore
index 9e2b236..84f0c9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ cover
 doc/build
 AUTHORS
 ChangeLog
+.stestr/
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..82d00f2
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=${OS_TEST_PATH:-./openstack_virtual_baremetal/tests}
+top_path=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index c52af66..0000000
--- a/.testr.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=60 OS_LOG_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./openstack_virtual_baremetal ./openstack_virtual_baremetal $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/doc/source/deploy/quintupleo.rst b/doc/source/deploy/quintupleo.rst
index 6994fe0..6e00d2c 100644
--- a/doc/source/deploy/quintupleo.rst
+++ b/doc/source/deploy/quintupleo.rst
@@ -79,8 +79,8 @@ however.
              that lists which BMC address corresponds to a given baremetal
              instance.
 
-Deleting an OVB Environment
----------------------------
+Deleting a QuintupleO Environment
+---------------------------------
 
 All of the OpenStack resources created by OVB are part of the Heat stack, so
 to delete the environment just delete the Heat stack.  There are a few local
diff --git a/doc/source/index.rst b/doc/source/index.rst
index bbf251f..e515368 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -17,11 +17,6 @@ Table of Contents
    troubleshooting
    api
 
-Search
-------
-
-* :ref:`search`
-
 Index
 -----
 * :ref:`genindex`
diff --git a/test-requirements.txt b/test-requirements.txt
index 6455919..a43749a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,7 +2,7 @@ coverage>=3.6
 discover
 fixtures>=0.3.14
 python-subunit>=0.0.18
-testrepository>=0.0.18
+stestr
 testtools>=0.9.36,!=1.2.0
 mock>=1.0
 
diff --git a/tox.ini b/tox.ini
index 4d255b4..dbf7db7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,23 +5,35 @@ envlist = py36,py27,pep8
 
 [testenv]
 usedevelop = True
-setenv = VIRTUAL_ENV={envdir}
+setenv =
+    VIRTUAL_ENV={envdir}
+    OS_STDOUT_CAPTURE=1
+    OS_STDERR_CAPTURE=1
+    OS_TEST_TIMEOUT=60
+    OS_LOG_CAPTURE=1
 deps = -r{toxinidir}/test-requirements.txt
        -r{toxinidir}/requirements.txt
-commands = python setup.py testr --slowest --testr-args='{posargs}'
+commands = stestr run {posargs}
 
 [testenv:venv]
 commands = {posargs}
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:pep8]
 deps = flake8
 commands = flake8
 
 [testenv:cover]
-commands = python setup.py test --coverage --coverage-package-name=openstack_virtual_baremetal --testr-args='{posargs}'
+basepython = python3
+setenv =
+    PYTHON=coverage run --source openstack_virtual_baremetal --parallel-mode
+commands =
+    stestr run '{posargs}'
+    coverage combine
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
 
 [testenv:genconfig]
 commands = python bin/environment-generator.py sample-env-generator --index doc/source/deploy/environment-index.rst