diff --git a/metadata.yaml b/metadata.yaml
index 2b34476b..daea16e9 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -10,7 +10,6 @@ tags:
 - identity
 - misc
 series:
-- xenial
 - bionic
 - focal
 - groovy
diff --git a/osci.yaml b/osci.yaml
index a07bfdb5..0b2a0aa5 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 5207df42..00000000
--- a/tests/bundles/trusty-mitaka.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-series: trusty
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
-- 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
-machines:
-  '0':
-    constraints: virt-type=kvm mem=3072M
-  '1':
-    constraints: virt-type=kvm
-  '2':
-    constraints: virt-type=kvm
-  '3':
-    constraints: virt-type=kvm
-  '4':
-    constraints: virt-type=kvm
-relations:
-- - keystone:shared-db
-  - mysql:shared-db
-- - glance:shared-db
-  - mysql:shared-db
-- - glance:identity-service
-  - keystone:identity-service
-applications:
-  mysql:
-    charm: cs:trusty/percona-cluster
-    num_units: 1
-    to:
-    - '0'
-  keystone:
-    series: trusty
-    charm: ../../../keystone
-    num_units: 3
-    options:
-      openstack-origin: cloud:trusty-mitaka
-    to:
-    - '1'
-    - '2'
-    - '3'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:trusty-mitaka
-    to:
-    - '4'
diff --git a/tests/bundles/xenial-mitaka.yaml b/tests/bundles/xenial-mitaka.yaml
deleted file mode 100644
index e2ed823d..00000000
--- a/tests/bundles/xenial-mitaka.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-series: xenial
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-  '3':
-  '4':
-relations:
-- - keystone:shared-db
-  - mysql:shared-db
-- - glance:shared-db
-  - mysql:shared-db
-- - glance:identity-service
-  - keystone:identity-service
-applications:
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-    - '0'
-  keystone:
-    series: xenial
-    charm: ../../../keystone
-    num_units: 3
-    to:
-    - '1'
-    - '2'
-    - '3'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    to:
-    - '4'
diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml
deleted file mode 100644
index 64f9d19a..00000000
--- a/tests/bundles/xenial-ocata.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-series: xenial
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-  '3':
-  '4':
-relations:
-- - keystone:shared-db
-  - mysql:shared-db
-- - glance:shared-db
-  - mysql:shared-db
-- - glance:identity-service
-  - keystone:identity-service
-applications:
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-    - '0'
-  keystone:
-    series: xenial
-    charm: ../../../keystone
-    num_units: 3
-    options:
-      openstack-origin: cloud:xenial-ocata
-      token-provider: 'fernet'
-      token-expiration: 300
-    to:
-    - '1'
-    - '2'
-    - '3'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-ocata
-    to:
-    - '4'
diff --git a/tests/bundles/xenial-pike.yaml b/tests/bundles/xenial-pike.yaml
deleted file mode 100644
index a29adcf4..00000000
--- a/tests/bundles/xenial-pike.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-series: xenial
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-  '3':
-  '4':
-relations:
-- - keystone:shared-db
-  - mysql:shared-db
-- - glance:shared-db
-  - mysql:shared-db
-- - glance:identity-service
-  - keystone:identity-service
-applications:
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-    - '0'
-  keystone:
-    series: xenial
-    charm: ../../../keystone
-    num_units: 3
-    options:
-      openstack-origin: cloud:xenial-pike
-      token-provider: 'fernet'
-      token-expiration: 300
-    to:
-    - '1'
-    - '2'
-    - '3'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-pike
-    to:
-    - '4'
diff --git a/tests/bundles/xenial-queens.yaml b/tests/bundles/xenial-queens.yaml
deleted file mode 100644
index 1320cfdc..00000000
--- a/tests/bundles/xenial-queens.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-series: xenial
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-  '3':
-  '4':
-relations:
-- - keystone:shared-db
-  - mysql:shared-db
-- - glance:shared-db
-  - mysql:shared-db
-- - glance:identity-service
-  - keystone:identity-service
-applications:
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-    - '0'
-  keystone:
-    series: xenial
-    charm: ../../../keystone
-    num_units: 3
-    options:
-      openstack-origin: cloud:xenial-queens
-      token-provider: 'fernet'
-      token-expiration: 300
-    to:
-    - '1'
-    - '2'
-    - '3'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-queens
-    to:
-    - '4'
diff --git a/tests/tests.yaml b/tests/tests.yaml
index f5cc8b9a..fcdba295 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 ba4fd5b6..86d1e904 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