diff --git a/.zuul.yaml b/.zuul.yaml
index 85e9189d..c6cd9970 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,14 +5,14 @@
       - publish-stx-docs
       - stx-api-ref-jobs
       - stx-release-notes-jobs
+      - stx-lint-specfile-jobs
+      - stx-build-rpms
     check:
       jobs:
         - flock-devstack-fault
         - openstack-tox-linters
         - openstack-tox-pep8
         - stx-fault-build
-        - flock-check-packaging:
-            voting: false
     gate:
       jobs:
         - flock-devstack-fault
@@ -51,12 +51,3 @@
         fault: https://opendev.org/starlingx/fault
         integ: https://opendev.org/starlingx/integ
         update: https://opendev.org/starlingx/update
-
-- job:
-    name: flock-check-packaging
-    parent: tox
-    description: Sanity check RPM spec files
-    required-projects:
-      - name: starlingx/integ
-    vars:
-      tox_envlist: rpm-packaging-lint
diff --git a/tox.ini b/tox.ini
index 6803b471..b413aabf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,14 +22,13 @@ install_command = pip install -U \
 deps = -r{toxinidir}/test-requirements.txt
 whitelist_externals = bash
 commands =
-  bash -c 'if [ -d {toxinidir}/../integ ]; then integdir={toxinidir}/../integ; \
-         else integdir={toxinidir}/../stx-integ; \
-         fi; \
+  bash -c 'if [ -d {toxinidir}/../zuul-jobs ]; then \
          find .           \
          -not \( -type d -name .?\* -prune \) \
          -not \( -type d -name centos -prune \) \
          -type f -name \*.spec                \
-         -print0 | xargs -0 $integdir/tools/spec-tools/speclint.sh'
+         -print0 | xargs -0 {toxinidir}/../zuul-jobs/scripts/speclint.sh; \
+         fi'
 
 [testenv:linters]
 basepython = python3