diff --git a/osci.yaml b/osci.yaml
index 02449f9..6f6e7b6 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -1,21 +1,13 @@
 - project:
     templates:
-      - charm-unit-jobs
-    check:
-      jobs:
-      - bionic-queens
-      - bionic-stein
-      - bionic-train
-      - bionic-ussuri
-      - focal-ussuri
-      - focal-victoria
-      - focal-wallaby
-      - focal-xena:
-         voting: false
-      - groovy-victoria
-      - hirsute-wallaby
-      - impish-xena:
-          voting: false
+      - charm-yoga-unit-jobs
+      - charm-yoga-functional-jobs
+      - charm-xena-functional-jobs
+      - charm-wallaby-functional-jobs
+      - charm-victoria-functional-jobs
+      - charm-ussuri-functional-jobs
+      - charm-stein-functional-jobs
+      - charm-queens-functional-jobs
     vars:
       needs_charm_build: true
       charm_build_name: keystone-kerberos
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..6dbc0d1
--- /dev/null
+++ b/src/tests/bundles/focal-yoga.yaml
@@ -0,0 +1,65 @@
+variables:
+  openstack-origin: &openstack-origin cloud:focal-yoga
+
+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':
+relations:
+- - keystone:shared-db
+  - keystone-mysql-router:shared-db
+- - keystone-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - keystone
+  - keystone-kerberos
+applications:
+  keystone-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
+      token-provider: 'fernet'
+      token-expiration: 60
+    to:
+    - '3'
+  keystone-kerberos:
+    charm: ../../../keystone-kerberos
+    options:
+      kerberos-realm: 'TESTUBUNTU.COM'
+      kerberos-server: 'kerberos.testubuntu.com'
+      kerberos-domain: 'k8s'
+    resource:
+      keystone_keytab: keystone.keytab
+
+  kerberos-server:
+    charm: cs:~openstack-charmers-next/kerberos-test-fixture
+    num_units: 1
+    to:
+      - '4'
+  ubuntu-test-host:
+    charm: cs:ubuntu
+    num_units: 1
+    to:
+      - '5'
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 6ab7f49..b48d7aa 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: groovy
+series: jammy
 comment:
 - 'machines section to decide order of deployment. database sooner = faster'
 machines:
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 362ed7f..9743b41 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -6,19 +6,19 @@ smoke_bundles:
 gate_bundles:
   - bionic-queens
   - bionic-stein
-  - bionic-train
   - bionic-ussuri
   - focal-ussuri
   - focal-victoria
   - focal-wallaby
   - focal-xena
-
-dev_bundles:
-  - bionic-rocky
-  - groovy-victoria
   - hirsute-wallaby
   - impish-xena
 
+dev_bundles:
+  - bionic-rocky
+  - bionic-train
+  - focal-yoga
+  - jammy-yoga
 
 configure:
   - zaza.openstack.charm_tests.kerberos.setup.run_all_configuration_steps
@@ -28,8 +28,9 @@ tests:
 
 tests_options:
   force_deploy:
-    - groovy-victoria
+    - hirsute-wallaby
     - impish-xena
+    - jammy-yoga
 
 target_deploy_status:
   keystone-kerberos:
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
diff --git a/tox.ini b/tox.ini
index 22159df..faf6092 100644
--- a/tox.ini
+++ b/tox.ini
@@ -75,6 +75,11 @@ basepython = python3.8
 deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
+[testenv:py39]
+basepython = python3.9
+deps = -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
+
 [testenv:pep8]
 basepython = python3
 deps = flake8==3.9.2