diff --git a/test-requirements.txt b/test-requirements.txt
index 138ad35..d5ab6d0 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,8 +2,10 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-hacking>=3.0.1,<3.1.0 # Apache-2.0
+hacking>=3.1.0,<4.0.0 # Apache-2.0
 
 stestr>=1.0.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 flake8-import-order>=0.17.1 # LGPLv3
+pycodestyle>=2.0.0,<2.7.0 # MIT
+
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index b3cd832..ac8a825 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -7,55 +7,55 @@
       jobs:
         # NOTE(dtantsur): keep N-3 and older non-voting for these jobs.
         - ironic-standalone
+        - ironic-standalone-victoria
         - ironic-standalone-ussuri
-        - ironic-standalone-train
-        - ironic-standalone-stein:
+        - ironic-standalone-train:
             voting: false
         - ironic-tempest-functional-python3
+        - ironic-tempest-functional-python3-victoria
         - ironic-tempest-functional-python3-ussuri
-        - ironic-tempest-functional-python3-train
-        - ironic-tempest-functional-python3-stein:
+        - ironic-tempest-functional-python3-train:
             voting: false
         - ironic-inspector-tempest
+        - ironic-inspector-tempest-victoria
         - ironic-inspector-tempest-ussuri
-        - ironic-inspector-tempest-train
-        - ironic-inspector-tempest-stein:
+        - ironic-inspector-tempest-train:
             voting: false
         - ironic-standalone-redfish
+        - ironic-standalone-redfish-victoria:
+            voting: false
         - ironic-standalone-redfish-ussuri:
             voting: false
         - ironic-standalone-redfish-train:
             voting: false
-        - ironic-standalone-redfish-stein:
-            voting: false
         # NOTE(dtantsur): these jobs cover rarely changed tests and are quite
         # unstable, so keep them non-voting.
         - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode:
             voting: false
+        - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-victoria:
+            voting: false
         - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-ussuri:
             voting: false
         - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-train:
             voting: false
-        - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-stein:
-            voting: false
         - ironic-inspector-tempest-discovery
+        - ironic-inspector-tempest-discovery-victoria:
+            voting: false
         - ironic-inspector-tempest-discovery-ussuri:
             voting: false
         - ironic-inspector-tempest-discovery-train:
             voting: false
-        - ironic-inspector-tempest-discovery-stein:
-            voting: false
     gate:
       queue: ironic
       jobs:
         - ironic-standalone
+        - ironic-standalone-victoria
         - ironic-standalone-ussuri
-        - ironic-standalone-train
         - ironic-tempest-functional-python3
+        - ironic-tempest-functional-python3-victoria
         - ironic-tempest-functional-python3-ussuri
-        - ironic-tempest-functional-python3-train
         - ironic-inspector-tempest
+        - ironic-inspector-tempest-victoria
         - ironic-inspector-tempest-ussuri
-        - ironic-inspector-tempest-train
         - ironic-standalone-redfish
         - ironic-inspector-tempest-discovery
diff --git a/zuul.d/stable-jobs.yaml b/zuul.d/stable-jobs.yaml
index b3824bc..dcc2df4 100644
--- a/zuul.d/stable-jobs.yaml
+++ b/zuul.d/stable-jobs.yaml
@@ -1,4 +1,9 @@
 - job:
+    name: ironic-standalone-victoria
+    parent: ironic-standalone
+    override-checkout: stable/victoria
+
+- job:
     name: ironic-standalone-ussuri
     parent: ironic-standalone
     override-checkout: stable/ussuri
@@ -12,12 +17,9 @@
         USE_PYTHON3: True
 
 - job:
-    name: ironic-standalone-stein
-    parent: ironic-standalone
-    override-checkout: stable/stein
-    vars:
-      devstack_localrc:
-        USE_PYTHON3: True
+    name: ironic-standalone-redfish-victoria
+    parent: ironic-standalone-redfish
+    override-checkout: stable/victoria
 
 - job:
     name: ironic-standalone-redfish-ussuri
@@ -33,12 +35,9 @@
         USE_PYTHON3: True
 
 - job:
-    name: ironic-standalone-redfish-stein
-    parent: ironic-standalone-redfish
-    override-checkout: stable/stein
-    vars:
-      devstack_localrc:
-        USE_PYTHON3: True
+    name: ironic-tempest-functional-python3-victoria
+    parent: ironic-tempest-functional-python3
+    override-checkout: stable/victoria
 
 - job:
     name: ironic-tempest-functional-python3-ussuri
@@ -51,9 +50,9 @@
     override-checkout: stable/train
 
 - job:
-    name: ironic-tempest-functional-python3-stein
-    parent: ironic-tempest-functional-python3
-    override-checkout: stable/stein
+    name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-victoria
+    parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
+    override-checkout: stable/victoria
 
 - job:
     name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-ussuri
@@ -69,12 +68,13 @@
         USE_PYTHON3: True
 
 - job:
-    name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-stein
-    parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
-    override-checkout: stable/stein
+    name: ironic-inspector-tempest-victoria
+    parent: ironic-inspector-tempest
+    override-checkout: stable/victoria
     vars:
       devstack_localrc:
-        USE_PYTHON3: True
+        FIXED_NETWORK_SIZE: 4096
+        EBTABLES_RACE_FIX: True
 
 - job:
     name: ironic-inspector-tempest-ussuri
@@ -96,14 +96,9 @@
         USE_PYTHON3: True
 
 - job:
-    name: ironic-inspector-tempest-stein
-    parent: ironic-inspector-tempest
-    override-checkout: stable/stein
-    vars:
-      devstack_localrc:
-        FIXED_NETWORK_SIZE: 4096
-        EBTABLES_RACE_FIX: True
-        USE_PYTHON3: True
+    name: ironic-inspector-tempest-discovery-victoria
+    parent: ironic-inspector-tempest-discovery
+    override-checkout: stable/victoria
 
 - job:
     name: ironic-inspector-tempest-discovery-ussuri
@@ -117,11 +112,3 @@
     vars:
       devstack_localrc:
         USE_PYTHON3: True
-
-- job:
-    name: ironic-inspector-tempest-discovery-stein
-    parent: ironic-inspector-tempest-discovery
-    override-checkout: stable/stein
-    vars:
-      devstack_localrc:
-        USE_PYTHON3: True