diff --git a/osci.yaml b/osci.yaml
index 90d2721..6da6c12 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -7,7 +7,15 @@
         - bionic-ussuri
         - focal-ussuri
         - focal-victoria
+        - focal-wallaby:
+            voting: false
+        - focal-xena:
+            voting: false
         - groovy-victoria
+        - hirsute-wallaby:
+            voting: false
+        - impish-xena:
+            voting: false
     vars:
       needs_charm_build: true
       charm_build_name: manila-dashboard
diff --git a/pip.sh b/pip.sh
new file mode 100755
index 0000000..9a7e6b0
--- /dev/null
+++ b/pip.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+#
+# This file is managed centrally by release-tools and should not be modified
+# within individual charm repos.  See the 'global' dir contents for available
+# choices of tox.ini for OpenStack Charms:
+#     https://github.com/openstack-charmers/release-tools
+#
+# setuptools 58.0 dropped the support for use_2to3=true which is needed to
+# install blessings (an indirect dependency of charm-tools).
+#
+# More details on the beahvior of tox and virtualenv creation can be found at
+# https://github.com/tox-dev/tox/issues/448
+#
+# This script is wrapper to force the use of the pinned versions early in the
+# process when the virtualenv was created and upgraded before installing the
+# depedencies declared in the target.
+pip install 'pip<20.3' 'setuptools<50.0.0'
+pip "$@"
diff --git a/rebuild b/rebuild
index d12439d..8e9ecc7 100644
--- a/rebuild
+++ b/rebuild
@@ -2,4 +2,4 @@
 # when dependencies of the charm change,
 # but nothing in the charm needs to.
 # simply change the uuid to something new
-fa0feaf6-b3eb-11eb-888c-7b0c0129d5a0
+53d08980-1178-11ec-a921-bf2fbb0482c1
diff --git a/src/tests/bundles/focal-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml
new file mode 100644
index 0000000..a8dcf5d
--- /dev/null
+++ b/src/tests/bundles/focal-wallaby.yaml
@@ -0,0 +1,98 @@
+variables:
+  openstack-origin: &openstack-origin cloud:focal-wallaby
+
+series: focal
+
+comment:
+- 'machines section to decide order of deployment. database sooner = faster'
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+    constraints: mem=3072M
+  '2':
+    constraints: mem=3072M
+  '3':
+  '4':
+  '5':
+  '6':
+
+applications:
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  manila-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  openstack-dashboard-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+
+  mysql-innodb-cluster:
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    to:
+      - '3'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+
+  manila:
+    charm: cs:~openstack-charmers-next/manila
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
+
+  openstack-dashboard:
+    charm: cs:~openstack-charmers-next/openstack-dashboard
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '6'
+
+  manila-dashboard:
+    charm: ../../../manila-dashboard
+
+relations:
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'manila:shared-db'
+    - 'manila-mysql-router:shared-db'
+  - - 'manila-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'manila:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'manila:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'openstack-dashboard:shared-db'
+    - 'openstack-dashboard-mysql-router:shared-db'
+  - - 'openstack-dashboard-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'openstack-dashboard:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'openstack-dashboard:dashboard-plugin'
+    - 'manila-dashboard:dashboard'
diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/focal-xena.yaml
new file mode 100644
index 0000000..46c46e1
--- /dev/null
+++ b/src/tests/bundles/focal-xena.yaml
@@ -0,0 +1,98 @@
+variables:
+  openstack-origin: &openstack-origin cloud:focal-xena
+
+series: focal
+
+comment:
+- 'machines section to decide order of deployment. database sooner = faster'
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+    constraints: mem=3072M
+  '2':
+    constraints: mem=3072M
+  '3':
+  '4':
+  '5':
+  '6':
+
+applications:
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  manila-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  openstack-dashboard-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+
+  mysql-innodb-cluster:
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    to:
+      - '3'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+
+  manila:
+    charm: cs:~openstack-charmers-next/manila
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
+
+  openstack-dashboard:
+    charm: cs:~openstack-charmers-next/openstack-dashboard
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '6'
+
+  manila-dashboard:
+    charm: ../../../manila-dashboard
+
+relations:
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'manila:shared-db'
+    - 'manila-mysql-router:shared-db'
+  - - 'manila-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'manila:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'manila:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'openstack-dashboard:shared-db'
+    - 'openstack-dashboard-mysql-router:shared-db'
+  - - 'openstack-dashboard-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'openstack-dashboard:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'openstack-dashboard:dashboard-plugin'
+    - 'manila-dashboard:dashboard'
diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml
new file mode 100644
index 0000000..95e6da4
--- /dev/null
+++ b/src/tests/bundles/hirsute-wallaby.yaml
@@ -0,0 +1,98 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: hirsute
+
+comment:
+- 'machines section to decide order of deployment. database sooner = faster'
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+    constraints: mem=3072M
+  '2':
+    constraints: mem=3072M
+  '3':
+  '4':
+  '5':
+  '6':
+
+applications:
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  manila-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  openstack-dashboard-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+
+  mysql-innodb-cluster:
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    to:
+      - '3'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+
+  manila:
+    charm: cs:~openstack-charmers-next/manila
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
+
+  openstack-dashboard:
+    charm: cs:~openstack-charmers-next/openstack-dashboard
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '6'
+
+  manila-dashboard:
+    charm: ../../../manila-dashboard
+
+relations:
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'manila:shared-db'
+    - 'manila-mysql-router:shared-db'
+  - - 'manila-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'manila:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'manila:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'openstack-dashboard:shared-db'
+    - 'openstack-dashboard-mysql-router:shared-db'
+  - - 'openstack-dashboard-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'openstack-dashboard:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'openstack-dashboard:dashboard-plugin'
+    - 'manila-dashboard:dashboard'
diff --git a/src/tests/bundles/impish-xena.yaml b/src/tests/bundles/impish-xena.yaml
new file mode 100644
index 0000000..5ea0976
--- /dev/null
+++ b/src/tests/bundles/impish-xena.yaml
@@ -0,0 +1,98 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: impish
+
+comment:
+- 'machines section to decide order of deployment. database sooner = faster'
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+    constraints: mem=3072M
+  '2':
+    constraints: mem=3072M
+  '3':
+  '4':
+  '5':
+  '6':
+
+applications:
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  manila-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  openstack-dashboard-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+
+  mysql-innodb-cluster:
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    to:
+      - '3'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+
+  manila:
+    charm: cs:~openstack-charmers-next/manila
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
+
+  openstack-dashboard:
+    charm: cs:~openstack-charmers-next/openstack-dashboard
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '6'
+
+  manila-dashboard:
+    charm: ../../../manila-dashboard
+
+relations:
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'manila:shared-db'
+    - 'manila-mysql-router:shared-db'
+  - - 'manila-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'manila:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'manila:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'openstack-dashboard:shared-db'
+    - 'openstack-dashboard-mysql-router:shared-db'
+  - - 'openstack-dashboard-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'openstack-dashboard:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'openstack-dashboard:dashboard-plugin'
+    - 'manila-dashboard:dashboard'
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 1c832f5..b9c251a 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -8,7 +8,12 @@ gate_bundles:
 - bionic-ussuri
 - focal-ussuri
 - focal-victoria
+- focal-xena
+
+dev_bundles:
 - groovy-victoria
+- hirsute-wallaby
+- impish-xena
 
 target_deploy_status:
   manila:
@@ -23,4 +28,5 @@ tests:
 
 tests_options:
   force_deploy:
-    - groovy-victoria
+    - hirsute-wallaby
+    - impish-xena
diff --git a/src/tox.ini b/src/tox.ini
index e763047..b40d295 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -22,12 +22,12 @@ skip_missing_interpreters = False
 requires = pip < 20.3
            virtualenv < 20.0
 # NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
-minversion = 3.2.0
+minversion = 3.18.0
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
-whitelist_externals = juju
+allowlist_externals = juju
 passenv = HOME TERM CS_* OS_* TEST_*
 deps = -r{toxinidir}/test-requirements.txt
 install_command =
diff --git a/tox.ini b/tox.ini
index 5c81801..22159df 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,6 +11,21 @@ envlist = pep8,py3
 sitepackages = False
 # NOTE: Avoid false positives by not skipping missing interpreters.
 skip_missing_interpreters = False
+# NOTES:
+# * We avoid the new dependency resolver by pinning pip < 20.3, see
+#   https://github.com/pypa/pip/issues/9187
+# * Pinning dependencies requires tox >= 3.2.0, see
+#   https://tox.readthedocs.io/en/latest/config.html#conf-requires
+# * It is also necessary to pin virtualenv as a newer virtualenv would still
+#   lead to fetching the latest pip in the func* tox targets, see
+#   https://stackoverflow.com/a/38133283
+requires =
+  pip < 20.3
+  virtualenv < 20.0
+  setuptools<50.0.0
+
+# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
+minversion = 3.18.0
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
@@ -21,7 +36,7 @@ setenv = VIRTUAL_ENV={envdir}
          JUJU_REPOSITORY={toxinidir}/build
 passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
 install_command =
-  pip install {opts} {packages}
+  {toxinidir}/pip.sh install {opts} {packages}
 deps =
     -r{toxinidir}/requirements.txt