diff --git a/.gitignore b/.gitignore
index 6e01b09..777fe80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,7 @@ dist
 renderspec.egg-info
 ChangeLog
 run_tests.err.log
-.testrepository
+.stestr/
 .tox
 doc/source/api
 doc/build
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..3aeee01
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./
+top_dir=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 6e4d6d0..0000000
--- a/.testr.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
-             OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
-             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
-             OS_LOG_CAPTURE=${OS_LOG_CAPTURE:-1} \
-             ${PYTHON:-python} -m subunit.run discover -t ./ ./ $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/.zuul.yaml b/.zuul.yaml
index 1e1c147..41e12f8 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -4,4 +4,3 @@
       - openstack-python35-jobs
       - openstack-python36-jobs
       - publish-openstack-docs-pti
-      - check-requirements
diff --git a/requirements.txt b/requirements.txt
index 7e0d826..0a7ecf5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,8 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-Jinja2!=2.9.0,!=2.9.1,!=2.9.2,!=2.9.3,!=2.9.4,>=2.8 # BSD License (3 clause)
 pymod2pkg!=0.8.0,>=0.7.0 # Apache-2.0
+Jinja2>=2.10 # BSD License (3 clause)
 PyYAML>=3.10 # MIT
 packaging>=16.5 # Apache-2.0
 six>=1.10.0 # MIT
diff --git a/test-requirements.txt b/test-requirements.txt
index 9a100cb..6074ca2 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,7 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 flake8>=3.5.0 # MIT
-testrepository>=0.0.18 # Apache-2.0/BSD
+stestr>=2.0.0 # Apache-2.0
 testresources>=2.0.0 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 ddt>=1.0.1 # MIT
diff --git a/tox.ini b/tox.ini
index 134c893..bcf1273 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@ deps =
         -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
        -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands = python setup.py testr --testr-args='{posargs}'
+commands = stestr run {posargs}
 
 [testenv:pep8]
 commands =