diff --git a/.zuul.yaml b/.zuul.yaml
index a5adce19e..0f3f8fef7 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,10 +1,10 @@
 - nodeset:
-    name: openstack-2-nodes
+    name: openstack-2-nodes-focal
     nodes:
       - name: controller
-        label: ubuntu-bionic
+        label: ubuntu-focal
       - name: compute1
-        label: ubuntu-bionic
+        label: ubuntu-focal
     groups:
       # Nodes running the compute service
       - name: compute
@@ -29,7 +29,7 @@
     parent: devstack
     description: |
       Base multinodes job for devstack-based functional tests
-    nodeset: openstack-2-nodes
+    nodeset: openstack-2-nodes-focal
     pre-run: playbooks/devstack/pre.yaml
     run: playbooks/devstack/run.yaml
     post-run: playbooks/devstack/post.yaml
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 3a6fb8dbf..fc4b1bb8c 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -10,13 +10,13 @@ beautifulsoup4==4.6.0
 cachetools==2.0.1
 castellan==0.16.0
 certifi==2018.1.18
-cffi==1.11.5
+cffi==1.14.0
 chardet==3.0.4
 cliff==2.11.0
 cmd2==0.8.2
 contextlib2==0.5.5
 coverage==4.0
-cryptography==2.1
+cryptography==2.7
 ddt===1.0.1
 debtcollector==1.19.0
 decorator==4.4.1
@@ -47,8 +47,8 @@ jsonpointer==2.0
 jsonschema==3.2.0
 keystoneauth1==3.15.0
 keystonemiddleware==4.17.0
-kombu==4.0.0
-kubernetes==5.0.0
+kombu==4.3.0
+kubernetes==7.0.0
 linecache2==1.0.0
 Mako==1.0.7
 MarkupSafe==1.1
@@ -69,7 +69,7 @@ oslo.cache==1.29.0
 oslo.concurrency==3.26.0
 oslo.config==5.2.0
 oslo.context==2.19.2
-oslo.db==4.27.0
+oslo.db==5.0.0
 oslo.i18n==3.20.0
 oslo.log==3.36.0
 oslo.messaging==9.3.0
@@ -140,7 +140,7 @@ stestr==2.0.0
 stevedore==1.20.0
 tempest==17.1.0
 Tempita==0.5.2
-tenacity==4.9.0
+tenacity==4.12.0
 testresources==2.0.1
 testscenarios==0.5.0
 testtools==2.2.0
diff --git a/requirements.txt b/requirements.txt
index 1111cbdf2..9050969be 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ eventlet!=0.23.0,!=0.25.0,>=0.22.0 # MIT
 requests>=2.14.2 # Apache-2.0
 jsonschema>=3.2.0 # MIT
 keystonemiddleware>=4.17.0 # Apache-2.0
-kombu!=4.0.2,>=4.0.0 # BSD
+kombu>=4.3.0 # BSD
 netaddr>=0.7.18 # BSD
 SQLAlchemy>=1.3.0 # MIT
 sqlalchemy-filters>=0.10.0
@@ -25,7 +25,7 @@ stevedore>=1.20.0 # Apache-2.0
 oslo.concurrency>=3.26.0 # Apache-2.0
 oslo.config>=5.2.0 # Apache-2.0
 oslo.context>=2.19.2 # Apache-2.0
-oslo.db>=4.27.0 # Apache-2.0
+oslo.db>=5.0.0 # Apache-2.0
 oslo.log>=3.36.0 # Apache-2.0
 oslo.messaging>=9.3.0 # Apache-2.0
 oslo.middleware>=3.31.0 # Apache-2.0
@@ -42,13 +42,13 @@ python-neutronclient>=6.7.0 # Apache-2.0
 python-novaclient>=9.1.0 # Apache-2.0
 tosca-parser>=1.6.0 # Apache-2.0
 heat-translator>=2.0.0 # Apache-2.0
-cryptography>=2.1 # BSD/Apache-2.0
+cryptography>=2.7 # BSD/Apache-2.0
 paramiko>=2.0.0 # LGPLv2.1+
 pyroute2>=0.4.21;sys_platform!='win32' # Apache-2.0 (+ dual licensed GPL2)
 python-mistralclient!=3.2.0,>=3.1.0 # Apache-2.0
 python-barbicanclient>=4.5.2 # Apache-2.0
 castellan>=0.16.0 # Apache-2.0
-kubernetes>=5.0.0 # Apache-2.0
+kubernetes>=7.0.0 # Apache-2.0
 setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,>=21.0.0 # PSF/ZPL
 tooz>=1.58.0 # Apache-2.0
 PyYAML>=5.1 # MIT
diff --git a/tools/test-setup.sh b/tools/test-setup.sh
index 07a078547..505a58cb7 100755
--- a/tools/test-setup.sh
+++ b/tools/test-setup.sh
@@ -23,8 +23,8 @@ sudo -H mysqladmin -u root password $DB_ROOT_PW
 sudo -H mysql -u root -p$DB_ROOT_PW -h localhost -e "
     DELETE FROM mysql.user WHERE User='';
     FLUSH PRIVILEGES;
-    GRANT ALL PRIVILEGES ON *.*
-        TO '$DB_USER'@'%' identified by '$DB_PW' WITH GRANT OPTION;"
+    CREATE USER '$DB_USER'@'%' IDENTIFIED BY '$DB_PW';
+    GRANT ALL PRIVILEGES ON *.* TO '$DB_USER'@'%' WITH GRANT OPTION;"
 
 # Now create our database.
 mysql -u $DB_USER -p$DB_PW -h 127.0.0.1 -e "