diff --git a/playbooks/post-cinderlib.yaml b/playbooks/post-cinderlib.yaml
new file mode 100644
index 0000000..f61775c
--- /dev/null
+++ b/playbooks/post-cinderlib.yaml
@@ -0,0 +1,6 @@
+- hosts: all
+  vars:
+    tox_envlist: functional
+    zuul_work_dir: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/cinderlib'].src_dir }}"
+  roles:
+    - fetch-tox-output
diff --git a/playbooks/tempest-and-cinderlib-run.yaml b/playbooks/tempest-and-cinderlib-run.yaml
new file mode 100644
index 0000000..5dddf7f
--- /dev/null
+++ b/playbooks/tempest-and-cinderlib-run.yaml
@@ -0,0 +1,28 @@
+# Playbook imported from https://opendev.org/openstack/tempest/src/tag/23.0.0/playbooks/devstack-tempest.yaml
+
+# Changes that run through devstack-tempest are likely to have an impact on
+# the devstack part of the job, so we keep devstack in the main play to
+# avoid zuul retrying on legitimate failures.
+- hosts: all
+  roles:
+    - orchestrate-devstack
+
+# We run tests only on one node, regardless how many nodes are in the system
+- hosts: tempest
+  environment:
+    # This enviroment variable is used by the optional tempest-gabbi
+    # job provided by the gabbi-tempest plugin. It can be safely ignored
+    # if that plugin is not being used.
+    GABBI_TEMPEST_PATH: "{{ gabbi_tempest_path | default('') }}"
+  roles:
+    - setup-tempest-run-dir
+    - setup-tempest-data-dir
+    - acl-devstack-files
+    - role: run-tempest
+      # ignore the errors, so that run-cinderlib-tests is always executed
+      ignore_errors: yes
+    - role: change-devstack-data-owner
+      devstack_data_subdir_changed: cinder
+      devstack_data_subdir_owner: zuul
+    - role: run-cinderlib-tests
+      cinderlib_base_dir: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/cinderlib'].src_dir }}"