diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 00000000..cb465cbf
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=${OS_TEST_PATH:-./tests}
+top_dir=./
diff --git a/test-requirements.txt b/test-requirements.txt
index 92747b71..0c9982ce 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,5 +7,5 @@ mock>=2.0.0 # BSD
 coverage!=4.4,>=4.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
 prometheus_client
-os-testr>=1.0.0 # Apache-2.0
+stestr>=1.0.0 # Apache-2.0
 docutils>=0.11 # OSI-Approved Open Source, Public Domain
diff --git a/tox.ini b/tox.ini
index 67eb9fef..025d8717 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,7 +26,7 @@ commands =
 basepython = python2.7
 commands =
   {[testenv]commands}
-  ostestr {posargs}
+  stestr run {posargs}
 
 [testenv:cover]
 basepython = python3