diff --git a/playbooks/run-libraries-litmus-tests.yaml b/playbooks/run-libraries-litmus-tests.yaml
new file mode 100644
index 000000000..3f55f5ff6
--- /dev/null
+++ b/playbooks/run-libraries-litmus-tests.yaml
@@ -0,0 +1,15 @@
+- hosts: all
+  tasks:
+    - shell:
+        cmd: |
+          set -e
+          set -x
+          trap "{{ ansible_user_dir }}/workspace/puppet-openstack-integration/copy_logs.sh" EXIT
+          if [ "{{ puppet_gem_version }}" != "latest" ]; then
+            export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}'
+          fi
+          ./run_litmus_tests.sh
+        executable: /bin/bash
+        chdir: '{{ ansible_user_dir }}/workspace'
+      become: yes
+      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 1d57d7148..aab97ef6f 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -30,8 +30,8 @@
         - puppet-openstack-libraries-puppet-unit-6.14-centos-8
         - puppet-openstack-libraries-puppet-unit-6.14-ubuntu-bionic
         - puppet-openstack-libraries-puppet-unit-latest-ubuntu-bionic
-        - puppet-openstack-libraries-puppet-beaker-rspec-centos-8
-        - puppet-openstack-libraries-puppet-beaker-rspec-ubuntu-bionic
+        - puppet-openstack-libraries-litmus-centos-8
+        - puppet-openstack-libraries-litmus-ubuntu-bionic
     gate:
       jobs:
         - puppet-openstack-libraries-puppet-lint-ubuntu-bionic
@@ -39,7 +39,7 @@
         - puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
         - puppet-openstack-libraries-puppet-unit-6.14-centos-8
         - puppet-openstack-libraries-puppet-unit-6.14-ubuntu-bionic
-        - puppet-openstack-libraries-puppet-beaker-rspec-centos-8
+        - puppet-openstack-libraries-litmus-centos-8
 
 # integration jobs
 - project-template:
diff --git a/zuul.d/litmus.yaml b/zuul.d/litmus.yaml
index 29767d464..485688aa0 100644
--- a/zuul.d/litmus.yaml
+++ b/zuul.d/litmus.yaml
@@ -5,12 +5,12 @@
     abstract: true
     pre-run: playbooks/prepare-node-litmus.yaml
     post-run: playbooks/upload-logs.yaml
-    run: playbooks/run-litmus-tests.yaml
     timeout: 5400
     irrelevant-files:
       - ^.*\.md$
       - ^.*\.rst$
       - ^doc/.*$
+      - ^etc/.*$
       - ^releasenotes/.*$
       - ^spec/unit/.*$
       - ^spec/classes/.*$
@@ -24,8 +24,20 @@
       - ^setup.py$
 
 - job:
-    name: puppet-openstack-litmus-centos-8
+    name: puppet-openstack-litmus-module-base
     parent: puppet-openstack-litmus-run-base
+    abstract: true
+    run: playbooks/run-litmus-tests.yaml
+
+- job:
+    name: puppet-openstack-litmus-libraries-base
+    parent: puppet-openstack-litmus-run-base
+    abstract: true
+    run: playbooks/run-libraries-litmus-tests.yaml
+
+- job:
+    name: puppet-openstack-litmus-centos-8
+    parent: puppet-openstack-litmus-module-base
     nodeset: centos-8
     vars:
       puppet_gem_version: 6.16
@@ -33,13 +45,27 @@
 
 - job:
     name: puppet-openstack-litmus-ubuntu-bionic
-    parent: puppet-openstack-litmus-run-base
+    parent: puppet-openstack-litmus-module-base
     nodeset: ubuntu-bionic
     voting: false
     vars:
       puppet_gem_version: latest
       ceph: nautilus
 
+- job:
+    name: puppet-openstack-libraries-litmus-centos-8
+    parent: puppet-openstack-litmus-libraries-base
+    vars:
+      puppet_gem_version: 6.18.0
+
+- job:
+    name: puppet-openstack-libraries-litmus-ubuntu-bionic
+    parent: puppet-openstack-litmus-libraries-base
+    voting: false
+    nodeset: ubuntu-bionic
+    vars:
+      puppet_gem_version: latest
+
 - project-template:
     name: puppet-openstack-litmus-jobs
     check: