diff --git a/.gitignore b/.gitignore
index 478debc3..0992b165 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,5 @@ build
 *.swp
 *.swo
 *.pyc
-.testrepository
+.stestr/
 .DS_Store
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 00000000..dcdf16e8
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+test_path=./tests
+top_dir=./
+
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 1641f86e..00000000
--- a/.testr.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 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/requirements.txt b/requirements.txt
index 8029a7d9..d0299d61 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ sphinxcontrib-actdiag
 sphinxcontrib-blockdiag
 sphinxcontrib-nwdiag
 sphinxcontrib-seqdiag
-testrepository>=0.0.18
+stestr>=2.0.0
 testtools>=0.9.34
 yasfb>=0.5.1
 whereto>=0.3.0  # Apache-2.0
diff --git a/tox.ini b/tox.ini
index eb5822a0..bb05ab80 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ usedevelop = True
 setenv = VIRTUAL_ENV={envdir}
 install_command = pip install -U {opts} {packages}
 deps = -r{toxinidir}/requirements.txt
-commands = python setup.py testr --slowest --testr-args='{posargs}'
+commands = stestr run --slowest {posargs}
 
 [testenv:venv]
 commands = {posargs}