diff --git a/.zuul.yaml b/.zuul.yaml
index af4ab1a..fad719e 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -14,34 +14,34 @@
         - openstack-tox-pep8:
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/ussuri
-        - openstack-tox-py27:
-            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
     gate:
       jobs:
         - openstack-tox-pep8:
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/ussuri
-        - openstack-tox-py27:
-            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
diff --git a/gbpautomation/heat/tests/test_grouppolicy.py b/gbpautomation/heat/tests/test_grouppolicy.py
index 0c10307..2de5fbe 100644
--- a/gbpautomation/heat/tests/test_grouppolicy.py
+++ b/gbpautomation/heat/tests/test_grouppolicy.py
@@ -12,7 +12,8 @@
 
 import copy
 
-import mock
+from unittest import mock
+
 import six
 
 from gbpautomation.heat.engine.resources import grouppolicy
diff --git a/gbpautomation/heat/tests/test_servicechain.py b/gbpautomation/heat/tests/test_servicechain.py
index 83b3a31..44a57d9 100644
--- a/gbpautomation/heat/tests/test_servicechain.py
+++ b/gbpautomation/heat/tests/test_servicechain.py
@@ -12,7 +12,8 @@
 
 import copy
 
-import mock
+from unittest import mock
+
 import six
 
 from gbpautomation.heat.engine.resources import servicechain
diff --git a/test-requirements.txt b/test-requirements.txt
index 5165588..30b84de 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,19 +2,22 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
--e git+https://opendev.org/openstack/heat.git@stable/ussuri#egg=heat
--e git+https://opendev.org/x/python-group-based-policy-client.git@stable/ussuri#egg=gbpclient
+-e git+https://opendev.org/openstack/heat.git@stable/victoria#egg=heat
+-e git+https://opendev.org/x/python-group-based-policy-client.git@stable/victoria#egg=gbpclient
 # Hacking already pins down pep8, pyflakes and flake8
-hacking!=0.13.0,<0.14,>=0.12.0;python_version=='2.7' # Apache-2.0
-hacking>=3.0.1,<3.1.0; python_version!='2.7' # Apache-2.0
+hacking>=3.0.1,<3.1.0; # 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
 bandit!=1.6.0,>=1.1.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 flake8-import-order==0.12 # LGPLv3
-kombu!=4.0.2,>=4.0.0 # BSD
-PyMySQL>=0.7.6 # MIT License
+kombu!=4.0.2,>=5.0.1 # BSD
+PyMySQL>=0.8.0 # MIT License
 os-testr>=1.0.0  # Apache-2.0
 oslotest>=3.2.0  # Apache-2.0
-psycopg2>=2.7 # LGPL/ZPL
+psycopg2>=2.8 # LGPL/ZPL
 stestr>=2.0.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
diff --git a/tox.ini b/tox.ini
index 84ccc59..d6f9a38 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@ setenv = VIRTUAL_ENV={envdir}
 usedevelop = True
 install_command = pip install {opts} {packages}
 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 =