diff --git a/.gitignore b/.gitignore
index dfa93ebf2..9cbc94cac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,5 @@ build
 *.swp
 *.swo
 *.pyc
-.testrepository
+.stestr/
 .idea
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 000000000..dcdf16e8d
--- /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 1641f86e3..000000000
--- 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/test-requirements.txt b/test-requirements.txt
index e5b90654c..7368ccc32 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,5 +4,5 @@
 
 hacking>=0.12.0,!=0.13.0,<0.14  # Apache-2.0
 oslo.utils>=3.33.0 # Apache-2.0
-testrepository>=0.0.18 # Apache-2.0/BSD
+stestr>=2.1.0 # Apache-2.0
 testtools>=1.4.0 # MIT
diff --git a/tox.ini b/tox.ini
index c81136a91..ac424562d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,7 +22,7 @@ deps =
   -r{toxinidir}/test-requirements.txt
 commands =
   find . -type f -name "*.pyc" -delete
-  python setup.py testr --slowest --testr-args='{posargs}'
+  stestr run --slowest {posargs}
   flake8 {posargs}
 
 [flake8]