diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 72b9a6d24..ca86e1727 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -92,7 +92,14 @@
     parent: puppet-openstack-base
     pre-run: playbooks/prepare-node-unit.yaml
     required-projects:
+      - name: openstack/puppet-nova
       - name: openstack/puppet-openstack_spec_helper
+    irrelevant-files:
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^releasenotes/.*$
+      - ^requirements.txt$
+      - ^test-requirements.txt$
 
 - job:
     name: puppet-openstack-syntax-base
@@ -115,6 +122,11 @@
       - ^setup.py$
       - ^tox.ini$
 
+- job:
+    name: puppet-openstack-libraries-puppet-syntax-base
+    parent: puppet-openstack-syntax-base
+    run: playbooks/run-libraries-syntax-tests.yaml
+
 - job:
     name: puppet-openstack-unit-base
     parent: puppet-openstack-integration-base
@@ -144,27 +156,5 @@
 
 - job:
     name: puppet-openstack-libraries-puppet-unit-base
-    parent: puppet-openstack-integration-base
+    parent: puppet-openstack-unit-base
     run: playbooks/run-libraries-unit-tests.yaml
-    pre-run: playbooks/prepare-node-unit.yaml
-    timeout: 3600
-    irrelevant-files:
-      - ^.*\.md$
-      - ^.*\.rst$
-      - ^doc/.*$
-      - ^etc/.*$
-      - ^examples/.*$
-      - ^metadata.json$
-      - ^releasenotes/.*$
-      - ^requirements.txt$
-      - ^test-requirements.txt$
-      - ^spec/acceptance/.*$
-      - ^LICENSE$
-      - ^.gitreview$
-      - ^.gitignore$
-      - ^.pdkignore$
-      - ^setup.cfg$
-      - ^setup.py$
-      - ^tox.ini$
-    vars:
-      rspec_puppet_version: 'latest'
diff --git a/zuul.d/linters.yaml b/zuul.d/linters.yaml
index 4f0a78228..27bc93a75 100644
--- a/zuul.d/linters.yaml
+++ b/zuul.d/linters.yaml
@@ -3,12 +3,6 @@
     name: puppet-openstack-lint-ubuntu-jammy
     parent: puppet-openstack-module-base
     run: playbooks/run-lint-tests.yaml
-    irrelevant-files:
-      - ^doc/.*$
-      - ^etc/.*$
-      - ^releasenotes/.*$
-      - ^requirements.txt$
-      - ^test-requirements.txt$
 
 - job:
     name: puppet-openstack-syntax-7-ubuntu-jammy
@@ -28,42 +22,18 @@
 
 - job:
     name: puppet-openstack-libraries-puppet-lint-ubuntu-jammy
-    parent: puppet-openstack-integration-base
+    parent: puppet-openstack-module-base
     run: playbooks/run-libraries-lint-tests.yaml
-    pre-run: playbooks/prepare-node-unit.yaml
-    timeout: 3600
-
-- job:
-    name: puppet-openstack-libraries-puppet-syntax
-    parent: puppet-openstack-integration-base
-    run: playbooks/run-libraries-syntax-tests.yaml
-    pre-run: playbooks/prepare-node-unit.yaml
-    timeout: 3600
-    irrelevant-files:
-      - ^.*\.md$
-      - ^.*\.rst$
-      - ^doc/.*$
-      - ^etc/.*$
-      - ^metadata.json$
-      - ^releasenotes/.*$
-      - ^test-requirements.txt$
-      - ^LICENSE$
-      - ^.gitignore$
-      - ^.gitreview$
-      - ^.pdkignore$
-      - ^setup.cfg$
-      - ^setup.py$
-      - ^tox.ini$
 
 - job:
     name: puppet-openstack-libraries-puppet-syntax-7-ubuntu-jammy
-    parent: puppet-openstack-libraries-puppet-syntax
+    parent: puppet-openstack-libraries-puppet-syntax-base
     vars:
       puppet: 7
 
 - job:
     name: puppet-openstack-libraries-puppet-syntax-8-centos-9-stream
-    parent: puppet-openstack-libraries-puppet-syntax
+    parent: puppet-openstack-libraries-puppet-syntax-base
     nodeset: centos-9-stream
     voting: false
     vars: