diff --git a/.gitignore b/.gitignore
index 0af11f2..d557cc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ pip-log.txt
 .tox
 nosetests.xml
 .testrepository
+.stestr
 .venv
 
 # Translations
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..d6fce1b
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./storyboardclient/tests/
+top_dir=./
diff --git a/test-requirements.txt b/test-requirements.txt
index ceaa9df..aee5c7b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,7 +7,7 @@ hacking>=0.9.2,<0.10
 coverage>=3.6
 python-subunit
 oslotest>=1.1.0.0a1
-os-testr>=0.4.1
+stestr>=2.0.0
 testrepository>=0.0.18
 testscenarios>=0.4
 testtools>=0.9.34
diff --git a/tox.ini b/tox.ini
index a8f7a63..1c4ff73 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ setenv =
    VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands = ostestr '{posargs}'
+commands = stestr run '{posargs}'
 
 [testenv:pep8]
 commands = flake8