diff --git a/.coveragerc b/.coveragerc
deleted file mode 100644
index d1e5e10..0000000
--- a/.coveragerc
+++ /dev/null
@@ -1,6 +0,0 @@
-[run]
-branch = True
-source = cinder_tempest_plugin
-
-[report]
-ignore_errors = True
diff --git a/.zuul.yaml b/.zuul.yaml
index 766c0ec..50e5fdf 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -28,9 +28,9 @@
         # As per the Tempest "Stable Branch Support Policy", Tempest will only
         # support the "Maintained" stable branches, so only jobs for the
         # current stable branches should be listed here.
+        - cinder-tempest-plugin-basic-2025-2
         - cinder-tempest-plugin-basic-2025-1
         - cinder-tempest-plugin-basic-2024-2
-        - cinder-tempest-plugin-basic-2024-1
         - cinder-tempest-plugin-protection-functional
     gate:
       jobs:
@@ -41,9 +41,9 @@
         - cinder-tempest-plugin-cbak-ceph
     experimental:
       jobs:
+        - cinder-tempest-plugin-cbak-ceph-2025-2
         - cinder-tempest-plugin-cbak-ceph-2025-1
         - cinder-tempest-plugin-cbak-ceph-2024-2
-        - cinder-tempest-plugin-cbak-ceph-2024-1
 
 - job:
     name: cinder-tempest-plugin-protection-functional
@@ -298,6 +298,12 @@
     timeout: 10800
 
 - job:
+    name: cinder-tempest-plugin-cbak-ceph-2025-2
+    parent: cinder-tempest-plugin-cbak-ceph
+    nodeset: openstack-single-node-noble
+    override-checkout: stable/2025.2
+
+- job:
     name: cinder-tempest-plugin-cbak-ceph-2025-1
     parent: cinder-tempest-plugin-cbak-ceph
     nodeset: openstack-single-node-jammy
@@ -308,12 +314,6 @@
     parent: cinder-tempest-plugin-cbak-ceph
     nodeset: openstack-single-node-jammy
     override-checkout: stable/2024.2
-
-- job:
-    name: cinder-tempest-plugin-cbak-ceph-2024-1
-    parent: cinder-tempest-plugin-cbak-ceph
-    nodeset: openstack-single-node-jammy
-    override-checkout: stable/2024.1
 
 # variant for pre-Ussuri branches (no volume revert for Ceph),
 # should this job be used on those branches
@@ -473,6 +473,12 @@
       - ^releasenotes/.*$
 
 - job:
+    name: cinder-tempest-plugin-basic-2025-2
+    parent: cinder-tempest-plugin-basic
+    nodeset: openstack-single-node-noble
+    override-checkout: stable/2025.2
+
+- job:
     name: cinder-tempest-plugin-basic-2025-1
     parent: cinder-tempest-plugin-basic
     nodeset: openstack-single-node-jammy
@@ -483,9 +489,3 @@
     parent: cinder-tempest-plugin-basic
     nodeset: openstack-single-node-jammy
     override-checkout: stable/2024.2
-
-- job:
-    name: cinder-tempest-plugin-basic-2024-1
-    parent: cinder-tempest-plugin-basic
-    nodeset: openstack-single-node-jammy
-    override-checkout: stable/2024.1
diff --git a/cinder_tempest_plugin/api/volume/test_create_from_image.py b/cinder_tempest_plugin/api/volume/test_create_from_image.py
index f44f630..11243ed 100644
--- a/cinder_tempest_plugin/api/volume/test_create_from_image.py
+++ b/cinder_tempest_plugin/api/volume/test_create_from_image.py
@@ -41,12 +41,7 @@
         volume_type_name = 'vol-type-for-6e9266ff-a917-4dd5-aa4a-c36e59e7a2a6'
         description = ('Generic volume_type for test '
                        '6e9266ff-a917-4dd5-aa4a-c36e59e7a2a6')
-        proto = CONF.volume.storage_protocol
-        vendor = CONF.volume.vendor_name
-        extra_specs = {"storage_protocol": proto,
-                       "vendor_name": vendor}
         kwargs = {'description': description,
-                  'extra_specs': extra_specs,
                   'os-volume-type-access:is_public': True}
         volume_type = self.create_volume_type(name=volume_type_name,
                                               **kwargs)
diff --git a/cinder_tempest_plugin/scenario/test_volume_encrypted.py b/cinder_tempest_plugin/scenario/test_volume_encrypted.py
index 69b0ab2..868695a 100644
--- a/cinder_tempest_plugin/scenario/test_volume_encrypted.py
+++ b/cinder_tempest_plugin/scenario/test_volume_encrypted.py
@@ -76,8 +76,7 @@
                                   **kwargs)
 
     @decorators.idempotent_id('5bb622ab-5060-48a8-8840-d589a548b9e4')
-    @utils.services('volume')
-    @utils.services('compute')
+    @utils.services('compute', 'volume')
     def test_attach_cloned_encrypted_volume(self):
 
         """This test case attempts to reproduce the following steps:
@@ -111,9 +110,7 @@
         self.attach_detach_volume(server, volume_source)
 
     @decorators.idempotent_id('5bb622ab-5060-48a8-8840-d589a548b7e4')
-    @utils.services('volume')
-    @utils.services('compute')
-    @utils.services('image')
+    @utils.services('volume', 'compute', 'image')
     def test_boot_cloned_encrypted_volume(self):
 
         """This test case attempts to reproduce the following steps:
diff --git a/setup.cfg b/setup.cfg
index e06cda0..a83b4b8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,7 +5,7 @@
 author = OpenStack
 author_email = openstack-discuss@lists.openstack.org
 url = http://www.openstack.org/
-python_requires = >=3.9
+python_requires = >=3.10
 classifiers =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -15,10 +15,10 @@
     Programming Language :: Python
     Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
     Programming Language :: Python :: 3.12
+    Programming Language :: Python :: 3.13
 
 [files]
 packages =
diff --git a/test-requirements.txt b/test-requirements.txt
index cb279bc..1625d80 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,7 +4,6 @@
 
 hacking>=6.1.0,<7.0 # Apache-2.0
 
-coverage!=4.4,>=4.0 # Apache-2.0
 python-subunit>=1.0.0 # Apache-2.0/BSD
 oslotest>=3.2.0 # Apache-2.0
 stestr>=1.0.0 # Apache-2.0