diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..5fcccac
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./unit_tests
+top_dir=./
diff --git a/test-requirements.txt b/test-requirements.txt
index 1bae0c7..9ea2415 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,2 +1,2 @@
-flake8>=2.2.4,<=2.4.1
-os-testr>=0.4.1
\ No newline at end of file
+flake8>=2.2.4
+stestr>=2.2.0
diff --git a/tox.ini b/tox.ini
index 1eda136..c5059eb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = pep8,py34,py35,py36
+envlist = pep8,py34,py35
 skipsdist = True
 # NOTE(beisner): Avoid build/test env pollution by not enabling sitepackages.
 sitepackages = False
@@ -11,7 +11,7 @@ setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
 install_command =
   pip install {opts} {packages}
-commands = ostestr {posargs}
+commands = stestr run {posargs}
 
 [testenv:py34]
 basepython = python3.4
@@ -27,6 +27,13 @@ deps = -r{toxinidir}/test-requirements.txt
 # https://github.com/juju/charm-tools/issues/249
 commands = /bin/true
 
+[testenv:py3]
+basepython = python3
+deps = -r{toxinidir}/test-requirements.txt
+# TODO: Need to write unit tests then remove the following command.
+# https://github.com/juju/charm-tools/issues/249
+commands = /bin/true
+
 [testenv:pep8]
 basepython = python3
 deps = -r{toxinidir}/test-requirements.txt