diff --git a/osci.yaml b/osci.yaml
index 8a73554..b601886 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -6,18 +6,20 @@
       # - charm-functional-jobs
     check:
       jobs:
-      - impish-xena:
+      - bionic-stein
+      - bionic-train
+      - bionic-ussuri
+      - focal-ussuri
+      - focal-victoria
+      - focal-wallaby
+      - focal-xena
+      - focal-yoga:
           voting: false
       - hirsute-wallaby
-      - groovy-victoria
-      - focal-xena:
+      - impish-xena:
+          voting: false
+      - jammy-yoga:
           voting: false
-      - focal-wallaby
-      - focal-victoria
-      - focal-ussuri
-      - bionic-ussuri
-      - bionic-train
-      - bionic-stein
     vars:
       needs_charm_build: true
       charm_build_name: barbican
diff --git a/requirements.txt b/requirements.txt
index b786b42..a68620f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,6 +9,7 @@
 setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
 
 # Build requirements
+cffi==1.14.6; python_version < '3.6'  # cffi 1.15.0 drops support for py35.
 charm-tools==2.8.3
 
 simplejson
diff --git a/src/tests/bundles/focal-yoga.yaml b/src/tests/bundles/focal-yoga.yaml
new file mode 100644
index 0000000..02c6749
--- /dev/null
+++ b/src/tests/bundles/focal-yoga.yaml
@@ -0,0 +1,74 @@
+variables:
+  openstack-origin: &openstack-origin cloud:focal-yoga
+
+series: &series focal
+
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+    constraints: mem=3072M
+  '2':
+    constraints: mem=3072M
+  '3':
+  '4':
+  '5':
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  barbican-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'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+
+  barbican:
+    series: *series
+    charm: ../../../barbican
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      debug: true
+    to:
+      - '4'
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    to:
+      - '5'
+
+relations:
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'barbican:shared-db'
+    - 'barbican-mysql-router:shared-db'
+  - - 'barbican-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'keystone:identity-service'
+    - 'barbican:identity-service'
+
+  - - 'rabbitmq-server:amqp'
+    - 'barbican:amqp'
diff --git a/src/tests/bundles/groovy-victoria.yaml b/src/tests/bundles/jammy-yoga.yaml
similarity index 98%
rename from src/tests/bundles/groovy-victoria.yaml
rename to src/tests/bundles/jammy-yoga.yaml
index 738ccc0..0892211 100644
--- a/src/tests/bundles/groovy-victoria.yaml
+++ b/src/tests/bundles/jammy-yoga.yaml
@@ -1,7 +1,7 @@
 variables:
   openstack-origin: &openstack-origin distro
 
-series: &series groovy
+series: &series jammy
 
 machines:
   '0':
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index a4e9009..51dafde 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -2,22 +2,23 @@ charm_name: barbican
 smoke_bundles:
 - focal-ussuri
 gate_bundles:
-- impish-xena
-- groovy-victoria
-- focal-xena
-- focal-wallaby
-- focal-victoria
-- focal-ussuri
-- bionic-ussuri
-- bionic-train
 - bionic-stein
-dev_bundles:
+- bionic-ussuri
+- focal-ussuri
+- focal-victoria
+- focal-wallaby
+- focal-xena
 - hirsute-wallaby
+- impish-xena
+dev_bundles:
 - bionic-rocky
+- bionic-train
+- focal-yoga
+- jammy-yoga
 tests:
 - zaza.openstack.charm_tests.barbican.tests.BarbicanTest
 tests_options:
   force_deploy:
     - hirsute-wallaby
-    - groovy-victoria
     - impish-xena
+    - jammy-yoga
diff --git a/test-requirements.txt b/test-requirements.txt
index af069e1..bb1307f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,6 +3,8 @@
 # choices of *requirements.txt files for OpenStack Charms:
 #     https://github.com/openstack-charmers/release-tools
 #
+pyparsing<3.0.0  # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here.
+cffi==1.14.6; python_version < '3.6'  # cffi 1.15.0 drops support for py35.
 setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
 
 stestr>=2.2.0