diff --git a/metadata.yaml b/metadata.yaml
index 63e82ae..c67bedc 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -7,7 +7,6 @@ description: |
 tags:
 - misc
 series:
-- xenial
 - bionic
 - focal
 - groovy
diff --git a/osci.yaml b/osci.yaml
index a07bfdb..0b2a0aa 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -1,13 +1,10 @@
 - project:
     templates:
-      - charm-unit-jobs
-      - charm-functional-jobs
-    check:
-      jobs:
-        - focal-xena
-        - focal-yoga:
-            voting: false
-        - impish-xena:
-            voting: false
-        - jammy-yoga:
-            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
diff --git a/tests/bundles/trusty-mitaka.yaml b/tests/bundles/trusty-mitaka.yaml
deleted file mode 100644
index 777cb74..0000000
--- a/tests/bundles/trusty-mitaka.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-series: trusty
-
-machines:
-  '0':
-  '1':
-  '2':
-  '3':
-
-relations:
-  - ['keystone:shared-db', 'percona-cluster:shared-db']
-  - ['hacluster:ha', 'keystone:ha']
-
-applications:
-  percona-cluster:
-    charm: cs:trusty/percona-cluster
-    num_units: 1
-    to:
-      - '0'
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 3
-    options:
-      openstack-origin: cloud:trusty-mitaka
-      token-expiration: 60
-    to:
-      - '1'
-      - '2'
-      - '3'
-  hacluster:
-    charm: ../../../hacluster
-    subordinate-to:
-      - keystone
diff --git a/tests/bundles/xenial-mitaka.yaml b/tests/bundles/xenial-mitaka.yaml
deleted file mode 100644
index 1aefcf3..0000000
--- a/tests/bundles/xenial-mitaka.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-series: xenial
-
-machines:
-  '0':
-  '1':
-  '2':
-  '3':
-
-relations:
-  - ['keystone:shared-db', 'percona-cluster:shared-db']
-  - ['hacluster:ha', 'keystone:ha']
-
-applications:
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-      - '0'
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 3
-    options:
-      token-expiration: 60
-    to:
-      - '1'
-      - '2'
-      - '3'
-  hacluster:
-    charm: ../../../hacluster
-    subordinate-to:
-      - keystone
diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml
deleted file mode 100644
index 5e367f5..0000000
--- a/tests/bundles/xenial-ocata.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-series: xenial
-
-machines:
-  '0':
-  '1':
-  '2':
-  '3':
-
-relations:
-  - ['keystone:shared-db', 'percona-cluster:shared-db']
-  - ['hacluster:ha', 'keystone:ha']
-
-applications:
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-      - '0'
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 3
-    options:
-      openstack-origin: cloud:xenial-ocata
-      token-expiration: 60
-    to:
-      - '1'
-      - '2'
-      - '3'
-  hacluster:
-    charm: ../../../hacluster
-    subordinate-to:
-      - keystone
diff --git a/tests/bundles/xenial-pike.yaml b/tests/bundles/xenial-pike.yaml
deleted file mode 100644
index c211041..0000000
--- a/tests/bundles/xenial-pike.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-series: xenial
-
-machines:
-  '0':
-  '1':
-  '2':
-  '3':
-
-relations:
-  - ['keystone:shared-db', 'percona-cluster:shared-db']
-  - ['hacluster:ha', 'keystone:ha']
-
-applications:
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-      - '0'
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 3
-    options:
-      openstack-origin: cloud:xenial-pike
-      token-expiration: 60
-    to:
-      - '1'
-      - '2'
-      - '3'
-  hacluster:
-    charm: ../../../hacluster
-    subordinate-to:
-      - keystone
diff --git a/tests/bundles/xenial-queens.yaml b/tests/bundles/xenial-queens.yaml
deleted file mode 100644
index 659ed28..0000000
--- a/tests/bundles/xenial-queens.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-series: xenial
-
-machines:
-  '0':
-  '1':
-  '2':
-  '3':
-
-relations:
-  - ['keystone:shared-db', 'percona-cluster:shared-db']
-  - ['hacluster:ha', 'keystone:ha']
-
-applications:
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-      - '0'
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 3
-    options:
-      openstack-origin: cloud:xenial-queens
-      token-expiration: 60
-    to:
-      - '1'
-      - '2'
-      - '3'
-  hacluster:
-    charm: ../../../hacluster
-    subordinate-to:
-      - keystone
diff --git a/tests/tests.yaml b/tests/tests.yaml
index bb7bbfb..6a2c836 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -15,11 +15,6 @@ gate_bundles:
   - impish-xena
 
 dev_bundles:
-  - trusty-mitaka
-  - xenial-mitaka
-  - xenial-ocata
-  - xenial-pike
-  - xenial-queens
   - bionic-rocky
   - bionic-train
   - focal-yoga
diff --git a/tox.ini b/tox.ini
index ba4fd5b..86d1e90 100644
--- a/tox.ini
+++ b/tox.ini
@@ -61,6 +61,11 @@ basepython = python3.8
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 
+[testenv:py39]
+basepython = python3.9
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+
 [testenv:py3]
 basepython = python3
 deps = -r{toxinidir}/requirements.txt