diff --git a/.zuul.yaml b/.zuul.yaml
index e066f40..85636d0 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -25,12 +25,14 @@
     vars:
       rtd_webhook_id: '44747'
     templates:
-      - openstack-python3-xena-jobs
+      - openstack-python3-zed-jobs
       - docs-on-readthedocs
       - check-requirements
     check:
       jobs:
+        - openstack-tox-py36
         - ironic-staging-drivers-all
     gate:
       jobs:
+        - openstack-tox-py36
         - ironic-staging-drivers-all
diff --git a/test-requirements.txt b/test-requirements.txt
index de1c963..4c592c9 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,5 +7,5 @@ python-subunit>=1.0.0 # Apache-2.0/BSD
 oslotest>=3.2.0 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
-os-testr>=1.0.0 # Apache-2.0
+stestr>=2.0.0 # Apache-2.0