diff --git a/.zuul.yaml b/.zuul.yaml
index dcc2f532..d0d56c61 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -84,6 +84,7 @@
       - openstack/python-tempestconf
       - openstack/tempest
       - openstack-dev/devstack
+    timeout: 5400
     roles:
       - zuul: openstack/packstack
       - zuul: openstack/python-tempestconf
@@ -109,6 +110,7 @@
       - openstack/python-tempestconf
       - openstack/tempest
       - openstack-dev/devstack
+    timeout: 5400
     roles:
       - zuul: openstack/packstack
       - zuul: openstack/python-tempestconf
diff --git a/requirements.txt b/requirements.txt
index e7439a54..a711d47a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,6 +5,5 @@
 pbr>=1.8 # Apache-2.0
 tempest>=14.0.0 # Apache-2.0
 requests>=2.10.0,!=2.12.2 # Apache-2.0
-stestr>=1.1.0 # Apache-2.0
 os-client-config>=1.26.0 # Apache-2.0
-oslo_config>=3.23.0 # Apache-2.0
+oslo.config>=3.23.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index e5ef58c7..54bb5d4b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,9 +7,9 @@ hacking>=0.12.0,<0.13 # Apache-2.0
 coverage>=4.0 # Apache-2.0
 python-subunit>=0.0.18 # Apache-2.0/BSD
 oslotest>=1.10.0 # Apache-2.0
-testrepository>=0.0.18  # Apache-2.0/BSD
 testscenarios>=0.4  # Apache-2.0/BSD
 testtools>=1.4.0 # MIT
+stestr>=1.1.0 # Apache-2.0
 
 # releasenotes
 reno>=1.8.0 # Apache-2.0