diff --git a/osci.yaml b/osci.yaml
index 3d63345..f8bc8d3 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -4,12 +4,8 @@
       - charm-functional-jobs
     check:
       jobs:
-      - jammy-zed-ec_cinder-ceph:
-          voting: false
-      - kinetic-zed-ec_cinder-ceph:
-          voting: false
-      - jammy-antelope-ec_cinder-ceph:
-          voting: false
+      - jammy-zed-ec_cinder-ceph
+      - jammy-antelope-ec_cinder-ceph
       - lunar-antelope-ec_cinder-ceph:
           voting: false
     vars:
@@ -28,13 +24,6 @@
         soft: true
     vars:
       tox_extra_args: '-- jammy-zed-ec'
-- job:
-    name: kinetic-zed-ec_cinder-ceph
-    parent: func-target
-    dependencies:
-      - jammy-zed-ec_cinder-ceph
-    vars:
-      tox_extra_args: '-- kinetic-zed-ec'
 - job:
     name: jammy-antelope-ec_cinder-ceph
     parent: func-target
diff --git a/tests/bundles/kinetic-zed-ec.yaml b/tests/bundles/kinetic-zed-ec.yaml
deleted file mode 100644
index 5047b31..0000000
--- a/tests/bundles/kinetic-zed-ec.yaml
+++ /dev/null
@@ -1,303 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: &series kinetic
-
-machines:
-  0:
-  1:
-  2:
-  3:
-  4:
-  5:
-  6:
-  7:
-  8:
-  9:
-  10:
-  11:
-  12:
-  13:
-  14:
-  15:
-  16:
-  # for the nova-compute unit
-  17:
-    constraints: mem=4G cores=4 root-disk=20G
-  18:
-  19:
-  20:
-
-applications:
-
-  nova-cloud-controller-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  placement-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  glance-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  neutron-api-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  cinder-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-    channel: latest/edge
-
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 6
-    storage:
-      osd-devices: '10G'
-    options:
-      osd-devices: '/dev/test-non-existent'
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-      - '18'
-      - '19'
-      - '20'
-    channel: latest/edge
-
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-      source: *openstack-origin
-    to:
-      - '6'
-      - '7'
-      - '8'
-    channel: latest/edge
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    to:
-      - '9'
-    channel: latest/edge
-
-  nova-cloud-controller:
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      network-manager: Neutron
-      debug: true
-    to:
-      - '10'
-    channel: latest/edge
-
-  placement:
-    charm: ch:placement
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '11'
-    channel: latest/edge
-
-  neutron-api:
-    charm: ch:neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      openstack-origin: *openstack-origin
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-    to:
-      - '12'
-    channel: latest/edge
-
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '13'
-    channel: latest/edge
-
-  neutron-gateway:
-    charm: ch:neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      bridge-mappings: physnet1:br-ex
-    to:
-      - '14'
-    channel: latest/edge
-
-  glance:
-    charm: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '15'
-    channel: latest/edge
-
-  neutron-openvswitch:
-    charm: ch:neutron-openvswitch
-    channel: latest/edge
-
-  cinder:
-    charm: ch:cinder
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      block-device: None
-      glance-api-version: 2
-    to:
-      - '16'
-    channel: latest/edge
-
-  cinder-ceph:
-    charm: ../../cinder-ceph.charm
-    options:
-      pool-type: erasure-coded
-      ec-profile-k: 4
-      ec-profile-m: 2
-
-  nova-compute:
-    charm: ch:nova-compute
-    num_units: 1
-    storage:
-      ephemeral-device: '40G'
-    options:
-      openstack-origin: *openstack-origin
-      config-flags: auto_assign_floating_ip=False
-      enable-live-migration: false
-      aa-profile-mode: enforce
-      debug: true
-    to:
-      - '17'
-    channel: latest/edge
-
-relations:
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'glance:ceph'
-    - 'ceph-mon:client'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-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'
-
-  - - 'neutron-api:neutron-api'
-    - 'nova-cloud-controller:neutron-api'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'rabbitmq-server:amqp'
-    - 'neutron-openvswitch:amqp'
-
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'cinder:image-service'
-    - 'glance:image-service'
-
-  - - 'cinder-ceph:storage-backend'
-    - 'cinder:storage-backend'
-
-  - - 'nova-compute:ceph-access'
-    - 'cinder-ceph:ceph-access'
-
-  - - 'ceph-mon:client'
-    - 'cinder-ceph:ceph'
-
-  - - 'ceph-mon:osd'
-    - 'ceph-osd:mon'
diff --git a/tests/bundles/kinetic-zed.yaml b/tests/bundles/kinetic-zed.yaml
deleted file mode 100644
index f227fe8..0000000
--- a/tests/bundles/kinetic-zed.yaml
+++ /dev/null
@@ -1,293 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: &series kinetic
-
-machines:
-  0:
-  1:
-  2:
-  3:
-  4:
-  5:
-  6:
-  7:
-  8:
-  9:
-  10:
-  11:
-  12:
-  13:
-  14:
-  15:
-  16:
-  # for the nova-compute unit
-  17:
-    constraints: mem=4G cores=4 root-disk=20G
-
-applications:
-
-  nova-cloud-controller-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  placement-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  glance-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  neutron-api-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  cinder-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-    channel: latest/edge
-
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: '10G'
-    options:
-      osd-devices: '/dev/test-non-existent'
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-    channel: latest/edge
-
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-      source: *openstack-origin
-    to:
-      - '6'
-      - '7'
-      - '8'
-    channel: latest/edge
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    to:
-      - '9'
-    channel: latest/edge
-
-  nova-cloud-controller:
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      network-manager: Neutron
-      debug: true
-    to:
-      - '10'
-    channel: latest/edge
-
-  placement:
-    charm: ch:placement
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '11'
-    channel: latest/edge
-
-  neutron-api:
-    charm: ch:neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      openstack-origin: *openstack-origin
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-    to:
-      - '12'
-    channel: latest/edge
-
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '13'
-    channel: latest/edge
-
-  neutron-gateway:
-    charm: ch:neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      bridge-mappings: physnet1:br-ex
-    to:
-      - '14'
-    channel: latest/edge
-
-  glance:
-    charm: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '15'
-    channel: latest/edge
-
-  neutron-openvswitch:
-    charm: ch:neutron-openvswitch
-    channel: latest/edge
-
-  cinder:
-    charm: ch:cinder
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      block-device: None
-      glance-api-version: 2
-    to:
-      - '16'
-    channel: latest/edge
-
-  cinder-ceph:
-    charm: ../../cinder-ceph.charm
-
-  nova-compute:
-    charm: ch:nova-compute
-    num_units: 1
-    storage:
-      ephemeral-device: '40G'
-    options:
-      openstack-origin: *openstack-origin
-      config-flags: auto_assign_floating_ip=False
-      enable-live-migration: false
-      aa-profile-mode: enforce
-      debug: true
-    to:
-      - '17'
-    channel: latest/edge
-
-relations:
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'glance:ceph'
-    - 'ceph-mon:client'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-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'
-
-  - - 'neutron-api:neutron-api'
-    - 'nova-cloud-controller:neutron-api'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'rabbitmq-server:amqp'
-    - 'neutron-openvswitch:amqp'
-
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'cinder:image-service'
-    - 'glance:image-service'
-
-  - - 'cinder-ceph:storage-backend'
-    - 'cinder:storage-backend'
-
-  - - 'nova-compute:ceph-access'
-    - 'cinder-ceph:ceph-access'
-
-  - - 'ceph-mon:client'
-    - 'cinder-ceph:ceph'
-
-  - - 'ceph-mon:osd'
-    - 'ceph-osd:mon'
diff --git a/tests/tests.yaml b/tests/tests.yaml
index ad197ca..3dfc023 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -14,8 +14,6 @@ gate_bundles:
 dev_bundles:
   - jammy-antelope-ec
   - jammy-antelope
-  - kinetic-zed-ec
-  - kinetic-zed
   - lunar-antelope-ec
   - lunar-antelope
 
@@ -42,7 +40,5 @@ tests_options:
   policyd:
     service: cinder
   force_deploy:
-    - kinetic-zed
-    - kinetic-zed-ec
     - lunar-antelope
     - lunar-antelope-ec