diff --git a/.zuul.yaml b/.zuul.yaml
index dcfbfb847f..7ea95164bb 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -71,6 +71,7 @@
 - job:
      name: keystone-tox-protection
      parent: openstack-tox-py37
+     timeout: 3600
      vars:
        tox_envlist: protection
        bindep_profile: test py37
@@ -168,17 +169,6 @@
       - release-notes-jobs-python3
     check:
       jobs:
-        # Override tox timeouts
-        - openstack-tox-py37:
-            timeout: 5400
-        - openstack-tox-py36:
-            timeout: 5400
-        - openstack-tox-py27:
-            timeout: 5400
-        - openstack-tox-cover:
-            timeout: 5400
-        - openstack-tox-lower-constraints:
-            timeout: 5400
         - keystone-dsvm-functional:
             irrelevant-files: &irrelevant-files
               - ^.*\.rst$
@@ -222,15 +212,6 @@
         - keystone-tox-protection
     gate:
       jobs:
-        # Override tox timeouts
-        - openstack-tox-py37:
-            timeout: 5400
-        - openstack-tox-py36:
-            timeout: 5400
-        - openstack-tox-py27:
-            timeout: 5400
-        - openstack-tox-lower-constraints:
-            timeout: 5400
         - keystone-dsvm-functional:
             irrelevant-files: *irrelevant-files
         - keystone-dsvm-py3-functional: