diff --git a/.gitignore b/.gitignore
index 7603adb..8703ecc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ ChangeLog
 monasca_transform.egg-info
 tools/vagrant/.vagrant
 doc/build/*
+.stestr
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..00f32a5
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=${OS_TEST_PATH:-./tests/unit}
+top_dir=./
diff --git a/test-requirements.txt b/test-requirements.txt
index 4ae2793..7cd6787 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,7 +7,7 @@ flake8<2.6.0,>=2.5.4 # MIT
 nose>=1.3.7 # LGPL
 mock>=2.0.0 # BSD
 fixtures>=3.0.0 # Apache-2.0/BSD
-os-testr>=1.0.0 # Apache-2.0
+stestr>=2.0.0 # Apache-2.0
 # required to build documentation
 sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
 #oslosphinx>=4.7.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 5e90f1b..a5c1793 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,7 +19,7 @@ whitelist_externals = bash
                       find
 commands =
   find . -type f -name "*.pyc" -delete
-  ostestr {posargs}
+  stestr run {posargs}
 
 [testenv:functional]
 basepython = python2.7
@@ -28,7 +28,7 @@ setenv = {[testenv]setenv}
          SPARK_SCALA_VERSION=2.10
          OS_TEST_PATH=tests/functional
 commands =
-  ostestr --serial {posargs}
+  stestr run --serial {posargs}
 
 [testenv:functional-py35]
 basepython = python3.5
@@ -36,7 +36,7 @@ setenv = {[testenv]setenv}
          SPARK_HOME=/opt/spark/current
          OS_TEST_PATH=tests/functional
 commands =
-  ostestr --serial {posargs}
+  stestr run --serial {posargs}
 
 [testenv:pep8]
 commands = flake8