diff --git a/.zuul.yaml b/.zuul.yaml
index 905450c..7a5a5a2 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,7 +1,7 @@
 - project:
     name: x/group-based-policy-ui
     templates:
-      - openstack-python-jobs
+      - openstack-python3-victoria-jobs
       - publish-to-pypi
     # REVISIT: In the jobs below, the required-projects clause is needed on
     # the master branch to select the correct version of the requirements
@@ -14,42 +14,42 @@
         - openstack-tox-pep8:
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/ussuri
-        - openstack-tox-py35:
-            required-projects:
-              - name: openstack/requirements
-                override-checkout: stable/ussuri
+                override-checkout: stable/victoria
         - openstack-tox-py36:
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/ussuri
+                override-checkout: stable/victoria
         - openstack-tox-py37:
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/ussuri
+                override-checkout: stable/victoria
+        - openstack-tox-py38:
+            required-projects:
+              - name: openstack/requirements
+                override-checkout: stable/victoria
         - test-release-openstack:
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/ussuri
+                override-checkout: stable/victoria
     gate:
       jobs:
         - openstack-tox-pep8:
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/ussuri
-        - openstack-tox-py35:
-            required-projects:
-              - name: openstack/requirements
-                override-checkout: stable/ussuri
+                override-checkout: stable/victoria
         - openstack-tox-py36:
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/ussuri
+                override-checkout: stable/victoria
         - openstack-tox-py37:
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/ussuri
+                override-checkout: stable/victoria
+        - openstack-tox-py38:
+            required-projects:
+              - name: openstack/requirements
+                override-checkout: stable/victoria
         - test-release-openstack:
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/ussuri
+                override-checkout: stable/victoria
diff --git a/test-requirements.txt b/test-requirements.txt
index fd57bf9..3f69d09 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,6 +8,10 @@
 #
 # Hacking should appear first in case something else depends on pep8
 hacking>=1.1.0,<2 # Apache-2.0
+# remove this pyflakes from here once you bump the
+# hacking to 3.2.0 or above. hacking 3.2.0 takes
+# care of pyflakes version compatibilty.
+pyflakes>=2.1.1
 # Replacing Horizon git URL reference as stable/train constraints are applied.
 horizon
 #
diff --git a/tox.ini b/tox.ini
index 4e96cd6..e782cee 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@ setenv = VIRTUAL_ENV={envdir}
 # random hash seed successfully.
          PYTHONHASHSEED=0
 deps =
-    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
+    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/victoria}
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
 commands = /bin/bash run_tests.sh -N --no-pep8 {posargs}