diff --git a/.gitignore b/.gitignore
index e19105a..1a584b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 .stestr
 *__pycache__*
 *.pyc
+.coverage
+cover/
diff --git a/test-requirements.txt b/test-requirements.txt
index 9c89fc9..c805e5d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,5 +1,5 @@
 # Lint and unit test requirements
 flake8
-os-testr>=0.4.1
+stestr>=2.2.0
 charms.reactive
 coverage>=3.6
diff --git a/tox.ini b/tox.ini
index fea4385..d93f987 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,17 +23,22 @@ install_command =
 [testenv:py35]
 basepython = python3.5
 deps = -r{toxinidir}/test-requirements.txt
-commands = ostestr {posargs}
+commands = stestr run {posargs}
 
 [testenv:py36]
 basepython = python3.6
 deps = -r{toxinidir}/test-requirements.txt
-commands = ostestr {posargs}
+commands = stestr run {posargs}
 
 [testenv:py37]
 basepython = python3.7
 deps = -r{toxinidir}/test-requirements.txt
-commands = ostestr {posargs}
+commands = stestr run {posargs}
+
+[testenv:py3]
+basepython = python3
+deps = -r{toxinidir}/test-requirements.txt
+commands = stestr run {posargs}
 
 [testenv:pep8]
 basepython = python3
@@ -50,7 +55,7 @@ setenv =
     PYTHON=coverage run
 commands =
     coverage erase
-    ostestr {posargs}
+    stestr run {posargs}
     coverage combine
     coverage html -d cover
     coverage xml -o cover/coverage.xml