diff --git a/.gitignore b/.gitignore
index 2652f1e..e1f2769 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ monclient/versioninfo
 .pydevproject
 .project
 .idea
+.stestr/
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..e2f86c4
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=${OS_TEST_PATH:-./monascaclient/tests}
+top_dir=./
diff --git a/requirements.txt b/requirements.txt
index dfd8bb5..2709321 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ oslo.utils>=3.33.0 # Apache-2.0
 Babel!=2.4.0,>=2.3.4 # BSD
 iso8601>=0.1.11 # MIT
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
-PrettyTable<0.8,>=0.7.1 # BSD
+PrettyTable<0.8,>=0.7.2 # BSD
 PyYAML>=3.12 # MIT
 
 six>=1.10.0 # MIT
diff --git a/test-requirements.txt b/test-requirements.txt
index 6b4e18a..f803f44 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,13 +7,13 @@ bandit>=1.1.0 # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
-os-testr>=1.0.0 # Apache-2.0
+stestr>=1.0.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 
 # documentation
 doc8>=0.6.0 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD
 reno>=2.5.0 # Apache-2.0
 openstackdocstheme>=1.18.1 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index e40de8b..9ee1eb7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,8 +20,7 @@ whitelist_externals = bash
                       rm
 commands =
   find {toxinidir} -type f -name "*.pyc" -delete
-  rm -Rf {toxinidir}/.testrepository/times.dbm
-  ostestr {posargs}
+  stestr run {posargs}
 
 [testenv:cover]
 basepython = python2.7