diff --git a/osci.yaml b/osci.yaml
index 55205d0..9c48741 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -1,23 +1,15 @@
 - project:
     templates:
-      - charm-unit-jobs
+      - 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
     check:
       jobs:
-      - bionic-queens
-      - bionic-stein
-      - bionic-train
-      - bionic-ussuri
-      - focal-ussuri
-      - focal-victoria
-      - focal-wallaby
-      - focal-xena
-      - focal-yoga:
-          voting: false
-      - hirsute-wallaby
-      - impish-xena:
-          voting: false
-      - jammy-yoga:
-          voting: false
       - test-s3-bionic-stein-s3
       - test-s3-bionic-train-s3
       - test-s3-bionic-ussuri-s3
diff --git a/src/metadata.yaml b/src/metadata.yaml
index a933b70..58d1442 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -10,7 +10,6 @@ description: |
 tags:
 - openstack
 series:
-- xenial
 - bionic
 - focal
 - groovy
diff --git a/src/tests/bundles/xenial-ocata.yaml b/src/tests/bundles/xenial-ocata.yaml
deleted file mode 100644
index dfae1c6..0000000
--- a/src/tests/bundles/xenial-ocata.yaml
+++ /dev/null
@@ -1,117 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:xenial-ocata
-
-series: &series xenial
-
-machines:
-  0:
-    constraints: "mem=3072M"
-  1: {}
-  2: {}
-  3: {}
-  4: {}
-  5: {}
-  6: {}
-  7: {}
-  8: {}
-  9: {}
-  10: {}
-  11: {}
-  12: {}
-
-# We specify machine placements for these to improve iteration
-# time, given that machine "0" comes up way before machine "6"
-applications:
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '1'
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '2'
-  ceilometer:
-    charm: cs:~openstack-charmers-next/ceilometer
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      source: *openstack-origin
-    to:
-      - '4'
-      - '5'
-      - '6'
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      expected-osd-count: 3
-      monitor-count: '3'
-      source: *openstack-origin
-    to:
-      - '7'
-      - '8'
-      - '9'
-  gnocchi:
-    series: *series
-    charm: ../../../gnocchi
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '10'
-  memcached:
-    charm: cs:~memcached-team/memcached
-    num_units: 1
-    to:
-      - '11'
-  mongodb:
-    charm: cs:mongodb
-    num_units: 1
-    to:
-      - '12'
-relations:
-  - - 'keystone:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-  - - 'ceilometer:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'ceilometer:identity-credentials'
-    - 'keystone:identity-credentials'
-  - - 'ceilometer:identity-notifications'
-    - 'keystone:identity-notifications'
-  - - 'ceilometer:shared-db'
-    - 'mongodb:database'
-  - - 'ceilometer:identity-service'
-    - 'keystone:identity-service'
-  - - 'ceilometer:metric-service'
-    - 'gnocchi:metric-service'
-  - - 'gnocchi:identity-service'
-    - 'keystone:identity-service'
-  - - 'gnocchi:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'gnocchi:storage-ceph'
-    - 'ceph-mon:client'
-  - - 'gnocchi:coordinator-memcached'
-    - 'memcached:cache'
diff --git a/src/tests/bundles/xenial-pike.yaml b/src/tests/bundles/xenial-pike.yaml
deleted file mode 100644
index 007272a..0000000
--- a/src/tests/bundles/xenial-pike.yaml
+++ /dev/null
@@ -1,117 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:xenial-pike
-
-series: &series xenial
-
-machines:
-  0:
-    constraints: "mem=3072M"
-  1: {}
-  2: {}
-  3: {}
-  4: {}
-  5: {}
-  6: {}
-  7: {}
-  8: {}
-  9: {}
-  10: {}
-  11: {}
-  12: {}
-
-# We specify machine placements for these to improve iteration
-# time, given that machine "0" comes up way before machine "6"
-applications:
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '1'
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '2'
-  ceilometer:
-    charm: cs:~openstack-charmers-next/ceilometer
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      source: *openstack-origin
-    to:
-      - '4'
-      - '5'
-      - '6'
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      expected-osd-count: 3
-      monitor-count: '3'
-      source: *openstack-origin
-    to:
-      - '7'
-      - '8'
-      - '9'
-  gnocchi:
-    series: *series
-    charm: ../../../gnocchi
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '10'
-  memcached:
-    charm: cs:~memcached-team/memcached
-    num_units: 1
-    to:
-      - '11'
-  mongodb:
-    charm: cs:mongodb
-    num_units: 1
-    to:
-      - '12'
-relations:
-  - - 'keystone:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-  - - 'ceilometer:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'ceilometer:identity-credentials'
-    - 'keystone:identity-credentials'
-  - - 'ceilometer:identity-notifications'
-    - 'keystone:identity-notifications'
-  - - 'ceilometer:shared-db'
-    - 'mongodb:database'
-  - - 'ceilometer:identity-service'
-    - 'keystone:identity-service'
-  - - 'ceilometer:metric-service'
-    - 'gnocchi:metric-service'
-  - - 'gnocchi:identity-service'
-    - 'keystone:identity-service'
-  - - 'gnocchi:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'gnocchi:storage-ceph'
-    - 'ceph-mon:client'
-  - - 'gnocchi:coordinator-memcached'
-    - 'memcached:cache'
diff --git a/src/tests/bundles/xenial-queens.yaml b/src/tests/bundles/xenial-queens.yaml
deleted file mode 100644
index 7dbcd7c..0000000
--- a/src/tests/bundles/xenial-queens.yaml
+++ /dev/null
@@ -1,107 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:xenial-queens
-
-series: &series xenial
-
-machines:
-  0:
-    constraints: "mem=3072M"
-  1: {}
-  2: {}
-  3: {}
-  4: {}
-  5: {}
-  6: {}
-  7: {}
-  8: {}
-  9: {}
-  10: {}
-  11: {}
-
-# We specify machine placements for these to improve iteration
-# time, given that machine "0" comes up way before machine "6"
-applications:
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '1'
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '2'
-  ceilometer:
-    charm: cs:~openstack-charmers-next/ceilometer
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      source: *openstack-origin
-    to:
-      - '4'
-      - '5'
-      - '6'
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      expected-osd-count: 3
-      monitor-count: '3'
-      source: *openstack-origin
-    to:
-      - '7'
-      - '8'
-      - '9'
-  gnocchi:
-    series: *series
-    charm: ../../../gnocchi
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '10'
-  memcached:
-    charm: cs:~memcached-team/memcached
-    num_units: 1
-    to:
-      - '11'
-relations:
-  - - 'keystone:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-  - - 'ceilometer:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'ceilometer:identity-credentials'
-    - 'keystone:identity-credentials'
-  - - 'ceilometer:identity-notifications'
-    - 'keystone:identity-notifications'
-  - - 'ceilometer:metric-service'
-    - 'gnocchi:metric-service'
-  - - 'gnocchi:identity-service'
-    - 'keystone:identity-service'
-  - - 'gnocchi:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'gnocchi:storage-ceph'
-    - 'ceph-mon:client'
-  - - 'gnocchi:coordinator-memcached'
-    - 'memcached:cache'
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 8c754a3..82b623d 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -13,9 +13,6 @@ gate_bundles:
 smoke_bundles:
   - focal-ussuri
 dev_bundles:
-  - xenial-ocata
-  - xenial-pike
-  - xenial-queens
   - bionic-rocky
   - test-s3: bionic-train-s3
   - test-s3: focal-yoga-s3
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