diff --git a/.gitignore b/.gitignore
index e7b762cd4..6317e5b05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,8 @@
 *.swp
 *.log
 .tox
-.testrepository/
 vendor/*
 Gemfile.lock
 packstack.egg-info
-releasenotes/build
\ No newline at end of file
+releasenotes/build
+.stestr
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 000000000..ea359caed
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./tests
+top_dir=./
diff --git a/test-requirements.txt b/test-requirements.txt
index 515e65c4d..f4a54b5b5 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,7 +1,7 @@
 sphinx>=1.6.2  # BSD
 openstackdocstheme>=1.17.0  # Apache-2.0
 reno>=0.1.1 # Apache2
-os-testr>=0.4.1 # Apache-2.0
+stestr>=1.0.0 # Apache-2.0
 coverage
 hacking!=0.13.0,<0.14,>=0.12.0
 mock>=2.0 # BSD
diff --git a/tox.ini b/tox.ini
index ddc7a4904..d5529b179 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,7 @@ setenv = VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = /usr/bin/find . -type f -name "*.pyc" -delete
-           ostestr {posargs}
+           stestr run {posargs}
 
 [tox:jenkins]
 sitepackages = True