diff --git a/.gitignore b/.gitignore
index a9621d7..6c4bce4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ tools/lintstack.head.py
 *.egg-info/
 .tox
 .testrepository
+.stestr
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..7564a2b
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=${OS_TEST_PATH:-./novajoin/tests}
+top_dir=./
diff --git a/test-requirements.txt b/test-requirements.txt
index 5141ba1..a0ff2b4 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -14,7 +14,7 @@ testtools>=2.2.0 # MIT
 testrepository>=0.0.18 # Apache-2.0/BSD
 testresources>=2.0.0 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
-os-testr>=1.0.0 # Apache-2.0
+stestr>=1.0.0 # Apache-2.0
 tempest>=17.1.0 # Apache-2.0
 bandit>=1.0.1 # Apache-2.0
 sphinx!=1.6.6,>=1.6.2 # BSD
diff --git a/tox.ini b/tox.ini
index 522aaa8..74f640b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,7 +21,7 @@ deps = -r{toxinidir}/test-requirements.txt
 commands =
   find . -type f -name "*.pyc" -delete
   rm -rf .testrepository/times.dbm
-  ostestr {posargs}
+  stestr run {posargs}
 
 whitelist_externals =
   bash