diff --git a/osci.yaml b/osci.yaml
index 1a14a59..d03ef69 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -4,10 +4,13 @@
       - charm-functional-jobs
     check:
       jobs:
-        - focal-xena:
+        - focal-xena
+        - focal-yoga:
             voting: false
         - impish-xena:
             voting: false
+        - jammy-yoga:
+            voting: false
     vars:
       needs_charm_build: true
       charm_build_name: designate-bind
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/metadata.yaml b/src/metadata.yaml
index 4f21a88..e161d07 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -18,6 +18,7 @@ series:
 - groovy
 - hirsute
 - impish
+- jammy
 subordinate: false
 extra-bindings:
   dns-frontend:
diff --git a/src/tests/bundles/focal-yoga.yaml b/src/tests/bundles/focal-yoga.yaml
new file mode 100644
index 0000000..7862402
--- /dev/null
+++ b/src/tests/bundles/focal-yoga.yaml
@@ -0,0 +1,132 @@
+variables:
+  openstack-origin: &openstack-origin cloud:focal-yoga
+
+series: focal
+
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+    constraints: mem=3072M
+  '2':
+    constraints: mem=3072M
+  '3':
+  '4':
+  '5':
+  '6':
+  '7':
+    series: bionic
+  '8':
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  designate-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  neutron-api-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
+    options:
+      source: *openstack-origin
+    to:
+    - '3'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+    - '4'
+
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: true
+      openstack-origin: *openstack-origin
+    to:
+    - '5'
+
+  designate-bind:
+    charm: ../../../designate-bind
+    num_units: 1
+    # NOTE(ajkavanagh) apparently it has no openstack origin!
+    #options:
+      #openstack-origin: *openstack-origin
+    to:
+    - '6'
+
+  memcached:
+    charm: cs:~memcached-team/memcached
+    num_units: 1
+    # holding charm at bionic as it isn't available for focal+ yet
+    series: bionic
+    to:
+    - '7'
+
+  designate:
+    charm: cs:~openstack-charmers-next/designate
+    num_units: 1
+    options:
+      nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
+      openstack-origin: *openstack-origin
+    to:
+    - '8'
+
+  nrpe:
+    charm: cs:nrpe
+
+relations:
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'designate:shared-db'
+    - 'designate-mysql-router:shared-db'
+  - - 'designate-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'designate:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'designate:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'designate:dns-backend'
+    - 'designate-bind:dns-backend'
+
+  - - 'designate:coordinator-memcached'
+    - 'memcached:cache'
+
+  - - 'designate:dnsaas'
+    - 'neutron-api:external-dns'
+
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'neutron-api:shared-db'
+    - 'neutron-api-mysql-router:shared-db'
+  - - 'neutron-api-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'designate:nrpe-external-master'
+    - 'nrpe:nrpe-external-master'
diff --git a/src/tests/bundles/jammy-yoga.yaml b/src/tests/bundles/jammy-yoga.yaml
new file mode 100644
index 0000000..2d97641
--- /dev/null
+++ b/src/tests/bundles/jammy-yoga.yaml
@@ -0,0 +1,133 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: jammy
+
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+    constraints: mem=3072M
+  '2':
+    constraints: mem=3072M
+  '3':
+  '4':
+  '5':
+  '6':
+  '7':
+    series: bionic
+  '8':
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  designate-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  neutron-api-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
+    options:
+      source: *openstack-origin
+    to:
+    - '3'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+    - '4'
+
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: true
+      openstack-origin: *openstack-origin
+    to:
+    - '5'
+
+  designate-bind:
+    charm: ../../../designate-bind
+    num_units: 1
+    # NOTE(ajkavanagh) apparently it has no openstack origin!
+    #options:
+      #openstack-origin: *openstack-origin
+    to:
+    - '6'
+
+  memcached:
+    charm: cs:~memcached-team/memcached
+    num_units: 1
+    # holding charm at bionic as it isn't available for focal+ yet
+    series: bionic
+    to:
+    - '7'
+
+  designate:
+    charm: cs:~openstack-charmers-next/designate
+    num_units: 1
+    options:
+      nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
+      openstack-origin: *openstack-origin
+    to:
+    - '8'
+
+  nrpe:
+    charm: cs:nrpe
+    series: focal
+
+relations:
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'designate:shared-db'
+    - 'designate-mysql-router:shared-db'
+  - - 'designate-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'designate:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'designate:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'designate:dns-backend'
+    - 'designate-bind:dns-backend'
+
+  - - 'designate:coordinator-memcached'
+    - 'memcached:cache'
+
+  - - 'designate:dnsaas'
+    - 'neutron-api:external-dns'
+
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'neutron-api:shared-db'
+    - 'neutron-api-mysql-router:shared-db'
+  - - 'neutron-api-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'designate:nrpe-external-master'
+    - 'nrpe:nrpe-external-master'
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index edd23db..f2e53bd 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -1,27 +1,29 @@
 charm_name: designate-bind
 
 smoke_bundles:
-  - bionic-train
+  - focal-ussuri
 
 gate_bundles:
-  - xenial-mitaka
   - bionic-queens
   - bionic-stein
   - bionic-ussuri
   - focal-ussuri
+  - focal-victoria
   - focal-wallaby
   - focal-xena
   - hirsute-wallaby
+  - impish-xena
 
 dev_bundles:
   - trusty-mitaka
+  - xenial-mitaka
   - xenial-ocata
   - xenial-pike
   - xenial-queens
-  - bionic-train
   - bionic-rocky
-  - focal-victoria
-  - impish-xena
+  - bionic-train
+  - focal-yoga
+  - jammy-yoga
 
 tests:
   - zaza.openstack.charm_tests.designate.tests.DesignateTests
@@ -33,4 +35,6 @@ target_deploy_status:
 
 tests_options:
   force_deploy:
+    - hirsute-wallaby
     - 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