diff --git a/.gitignore b/.gitignore
index 6249bf6a..ae99603f 100755
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,4 @@ cover/
 .coverage
 .testrepository/
 .venv
-.stestr
\ No newline at end of file
+.stestr
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 00000000..69fecec8
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+test_path=${OS_TEST_PATH:-./monasca_common/tests}
+top_dir=./
+group_regex=monasca_common\.tests(?:\.|_)([^_]+)
diff --git a/test-requirements.txt b/test-requirements.txt
index 2f12d63f..e3c410b9 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -11,7 +11,7 @@ httplib2>=0.9.1 # MIT
 mock>=2.0.0 # BSD
 oslo.context>=2.19.2 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
-os-testr>=1.0.0 # Apache-2.0
+stestr>=1.0.0 # Apache-2.0
 requests-mock>=1.2.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
diff --git a/tox.ini b/tox.ini
index 34bce18a..1b9a1bec 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,7 +28,7 @@ commands =
 basepython = python2.7
 commands =
   {[testenv]commands}
-  ostestr {posargs}
+  stestr run {posargs}
 
 [testenv:py35]
 basepython = python3.5
@@ -37,7 +37,7 @@ setenv =
   BLACKLIST_FILE={toxinidir}/test-blacklist-py3.txt
 commands =
   {[testenv]commands}
-  ostestr --blacklist-file {env:BLACKLIST_FILE} {posargs}
+  stestr run --blacklist-file {env:BLACKLIST_FILE} {posargs}
 
 [testenv:cover]
 basepython = python2.7