diff --git a/.stestr.conf b/.stestr.conf
index 759f1e3..d81c293 100644
--- a/.stestr.conf
+++ b/.stestr.conf
@@ -1,3 +1,3 @@
 [DEFAULT]
-test_path=./sahara/tests
+test_path=./sahara/tests/unit
 top_dir=./
diff --git a/test-requirements.txt b/test-requirements.txt
index c1a5dc7..52c0626 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -12,7 +12,7 @@ doc8>=0.6.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 mock>=2.0.0 # BSD
 oslotest>=3.2.0 # Apache-2.0
-os-testr>=1.0.0 # Apache-2.0
+stestr>=1.0.0 # Apache-2.0
 psycopg2>=2.6.2 # LGPL/ZPL
 pylint==1.4.5 # GPLv2
 testresources>=2.0.0 # Apache-2.0/BSD
diff --git a/tox.ini b/tox.ini
index 73dec7e..e9ff9ae 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@ setenv =
 deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
-commands = ostestr {posargs}
+commands = stestr run {posargs}
 passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
 
 [testenv:cover]