diff --git a/.zuul.yaml b/.zuul.yaml
index 1068175..0dc96f5 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,8 +5,13 @@
     check:
       jobs:
         - cinder-tempest-plugin-lvm-lio-barbican
+        - cinder-tempest-plugin-lvm-lio-barbican-centos-8:
+            voting: false
         - cinder-tempest-plugin-lvm-tgt-barbican
         - cinder-tempest-plugin-cbak-ceph
+        - cinder-tempest-plugin-basic-ussuri
+        - cinder-tempest-plugin-basic-train
+        - cinder-tempest-plugin-basic-stein
     gate:
       jobs:
         - cinder-tempest-plugin-lvm-lio-barbican
@@ -64,6 +69,7 @@
       Integration tests that runs with the ceph devstack plugin, py3
       and enable the backup service.
     vars:
+      tempest_black_regex: '(VolumesBackupsTest.test_bootable_volume_backup_and_restore|TestVolumeBackupRestore.test_volume_backup_restore)'
       devstack_local_conf:
         test-config:
           $TEMPEST_CONFIG:
@@ -78,6 +84,7 @@
     name: cinder-tempest-plugin-cbak-ceph
     branches: ^(?=stable/(ocata|pike|queens|rocky|stein|train)).*$
     vars:
+      tempest_black_regex: ''
       devstack_local_conf:
         test-config:
           $TEMPEST_CONFIG:
@@ -95,8 +102,57 @@
         CINDER_ISCSI_HELPER: lioadm
 
 - job:
+    name: cinder-tempest-plugin-lvm-lio-barbican-centos-8
+    parent: cinder-tempest-plugin-lvm-lio-barbican
+    nodeset: devstack-single-node-centos-8
+    description: |
+      This jobs configures Cinder with LVM, LIO, barbican and
+      runs tempest tests and cinderlib tests on CentOS 8.
+
+- job:
     name: cinder-tempest-plugin-lvm-tgt-barbican
     description: |
       This jobs configures Cinder with LVM, tgt, barbican and
       runs tempest tests and cinderlib tests.
     parent: cinder-tempest-plugin-lvm-barbican-base
+
+- job:
+    name: cinder-tempest-plugin-basic
+    parent: devstack-tempest
+    description: |
+      Cinder tempest plugin tests job which run only cinder-tempest-plugin
+      tests.
+    required-projects:
+      - opendev.org/openstack/cinder-tempest-plugin
+    vars:
+      devstack_localrc:
+        TEMPEST_VOLUME_REVERT_TO_SNAPSHOT: True
+      tox_envlist: all
+      tempest_test_regex: cinder_tempest_plugin
+      tempest_plugins:
+        - cinder-tempest-plugin
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^doc/.*$
+      - ^releasenotes/.*$
+
+- job:
+    name: cinder-tempest-plugin-basic-ussuri
+    parent: cinder-tempest-plugin-basic
+    override-checkout: stable/ussuri
+
+- job:
+    name: cinder-tempest-plugin-basic-train
+    parent: cinder-tempest-plugin-basic
+    override-checkout: stable/train
+    vars:
+      devstack_localrc:
+        USE_PYTHON3: True
+
+- job:
+    name: cinder-tempest-plugin-basic-stein
+    parent: cinder-tempest-plugin-basic
+    override-checkout: stable/stein
+    vars:
+      devstack_localrc:
+        USE_PYTHON3: True
diff --git a/playbooks/post-cinderlib.yaml b/playbooks/post-cinderlib.yaml
index f61775c..6384bd1 100644
--- a/playbooks/post-cinderlib.yaml
+++ b/playbooks/post-cinderlib.yaml
@@ -1,4 +1,4 @@
-- hosts: all
+- hosts: tempest
   vars:
     tox_envlist: functional
     zuul_work_dir: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/cinderlib'].src_dir }}"
diff --git a/playbooks/tempest-and-cinderlib-run.yaml b/playbooks/tempest-and-cinderlib-run.yaml
index ff99d08..8e26913 100644
--- a/playbooks/tempest-and-cinderlib-run.yaml
+++ b/playbooks/tempest-and-cinderlib-run.yaml
@@ -25,6 +25,7 @@
       devstack_data_subdir_changed: cinder
       devstack_data_subdir_owner: zuul
     - role: run-cinderlib-tests
+      tox_install_siblings: false
       cinderlib_base_dir: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/cinderlib'].src_dir }}"
   post_tasks:
     - name: Fail if the first tempest run did not work
diff --git a/test-requirements.txt b/test-requirements.txt
index bd50458..e0bd682 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,7 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-hacking>=3.0,<3.1 # Apache-2.0
+hacking>=3.0.1,<3.1 # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0
 python-subunit>=1.0.0 # Apache-2.0/BSD