diff --git a/.gitignore b/.gitignore
index f678959..93bed77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,12 +34,11 @@ pip-delete-this-directory.txt
 
 # Unit test / coverage reports
 htmlcov/
-.testrepository/
+.stestr/
 .tox/
 .coverage
 cover
 .cache
-nosetests.xml
 coverage.xml
 
 # Translations
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..49859d1
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+test_path=./automaton/tests
+top_dir=./
+
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 25e2f18..0000000
--- a/.testr.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[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 -t ./ . $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
-
diff --git a/lower-constraints.txt b/lower-constraints.txt
index ced273f..cfdd64e 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -40,7 +40,7 @@ snowballstemmer==1.2.1
 Sphinx==1.6.5
 sphinxcontrib-websupport==1.0.1
 stevedore==1.20.0
-testrepository==0.0.18
+stestr==2.0.0
 testtools==2.2.0
 traceback2==1.4.0
 unittest2==1.1.0
diff --git a/requirements.txt b/requirements.txt
index c619191..b3e3d6b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,4 +9,4 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0
 six>=1.10.0 # MIT
 
 # For pretty formatting machines/state tables...
-PrettyTable<0.8,>=0.7.1 # BSD
+PrettyTable<0.8,>=0.7.2 # BSD
diff --git a/test-requirements.txt b/test-requirements.txt
index af47c59..78d24a7 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,10 +6,9 @@ hacking<0.11,>=0.10.0
 
 doc8>=0.6.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
-python-subunit>=1.0.0 # Apache-2.0/BSD
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD
 openstackdocstheme>=1.18.1 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
-testrepository>=0.0.18 # Apache-2.0/BSD
+stestr>=2.0.0 # Apache-2.0
 testtools>=2.2.0 # MIT
 reno>=2.5.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 08685c7..b067a3c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@ deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
-commands = python setup.py test --slowest --testr-args='{posargs}'
+commands = stestr run --slowest {posargs}
 
 [testenv:pep8]
 basepython = python3
@@ -21,7 +21,7 @@ commands = flake8 {posargs}
 [testenv:py27]
 basepython = python2.7
 commands =
-    python setup.py testr --slowest --testr-args='{posargs}'
+    {[testenv]commands}
     sphinx-build -b doctest doc/source doc/build
     doc8 --ignore-path "doc/source/history.rst" doc/source