diff --git a/tools/generate-tempest-plugins-list.py b/tools/generate-tempest-plugins-list.py
index 2e8ced5348..0690d5700f 100644
--- a/tools/generate-tempest-plugins-list.py
+++ b/tools/generate-tempest-plugins-list.py
@@ -79,6 +79,10 @@ NON_ACTIVE_LIST = [
     # No changes are merging in this
     # https://review.opendev.org/q/project:x%252Fnetworking-fortinet
     'x/networking-fortinet'
+    # It is broken and it use retired plugin 'patrol'. Last change done
+    # in this plugin was 7 years ago.
+    # https://opendev.org/airship/tempest-plugin
+    'airship/tempest-plugin'
 ]
 
 url = 'https://review.opendev.org/projects/'
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index e69fb608f0..45e117fae7 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -43,34 +43,32 @@
             irrelevant-files: *tempest-irrelevant-files
         - tempest-multinode-full-py3:
             irrelevant-files: *tempest-irrelevant-files
-        # this is failing because airship depend on patole which is eol and
-        # no longer works due to pkg_resources.
-        # - tempest-tox-plugin-sanity-check:
-        #     irrelevant-files: &tempest-irrelevant-files-2
-        #       - ^.*\.rst$
-        #       - ^doc/.*$
-        #       - ^etc/.*$
-        #       - ^releasenotes/.*$
-        #       - ^setup.cfg$
-        #       - ^tempest/hacking/.*$
-        #       - ^tempest/tests/.*$
-        #       - ^.coveragerc$
-        #       - ^.gitignore$
-        #       - ^.gitreview$
-        #       - ^.mailmap$
-        #       - ^tools/check_logs.py
-        #       - ^tools/format.sh
-        #       - ^tools/skip_tracker.py
-        #       - ^tools/tempest-integrated-gate-compute-exclude-list.txt
-        #       - ^tools/tempest-integrated-gate-networking-exclude-list.txt
-        #       - ^tools/tempest-integrated-gate-object-storage-exclude-list.txt
-        #       - ^tools/tempest-integrated-gate-placement-exclude-list.txt
-        #       - ^tools/tempest-integrated-gate-storage-blacklist.txt
-        #       - ^tools/tempest-integrated-gate-storage-exclude-list.txt
-        #       - ^tools/tempest-extra-tests-list.txt
-        #       - ^tools/verify-ipv6-only-deployments.sh
-        #       - ^tools/with_venv.sh
-        #       # tools/ is not here since this relies on a script in tools/.
+        - tempest-tox-plugin-sanity-check:
+            irrelevant-files: &tempest-irrelevant-files-2
+              - ^.*\.rst$
+              - ^doc/.*$
+              - ^etc/.*$
+              - ^releasenotes/.*$
+              - ^setup.cfg$
+              - ^tempest/hacking/.*$
+              - ^tempest/tests/.*$
+              - ^.coveragerc$
+              - ^.gitignore$
+              - ^.gitreview$
+              - ^.mailmap$
+              - ^tools/check_logs.py
+              - ^tools/format.sh
+              - ^tools/skip_tracker.py
+              - ^tools/tempest-integrated-gate-compute-exclude-list.txt
+              - ^tools/tempest-integrated-gate-networking-exclude-list.txt
+              - ^tools/tempest-integrated-gate-object-storage-exclude-list.txt
+              - ^tools/tempest-integrated-gate-placement-exclude-list.txt
+              - ^tools/tempest-integrated-gate-storage-blacklist.txt
+              - ^tools/tempest-integrated-gate-storage-exclude-list.txt
+              - ^tools/tempest-extra-tests-list.txt
+              - ^tools/verify-ipv6-only-deployments.sh
+              - ^tools/with_venv.sh
+              # tools/ is not here since this relies on a script in tools/.
         - tempest-ipv6-only:
             irrelevant-files: &tempest-irrelevant-files-3
               - ^.*\.rst$
@@ -121,31 +119,7 @@
         - ironic-tempest-bios-ipmi-direct:
             irrelevant-files: *tempest-irrelevant-files
         - openstack-tox-bashate:
-            irrelevant-files: &tempest-irrelevant-files-2
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^etc/.*$
-              - ^releasenotes/.*$
-              - ^setup.cfg$
-              - ^tempest/hacking/.*$
-              - ^tempest/tests/.*$
-              - ^.coveragerc$
-              - ^.gitignore$
-              - ^.gitreview$
-              - ^.mailmap$
-              - ^tools/check_logs.py
-              - ^tools/format.sh
-              - ^tools/skip_tracker.py
-              - ^tools/tempest-integrated-gate-compute-exclude-list.txt
-              - ^tools/tempest-integrated-gate-networking-exclude-list.txt
-              - ^tools/tempest-integrated-gate-object-storage-exclude-list.txt
-              - ^tools/tempest-integrated-gate-placement-exclude-list.txt
-              - ^tools/tempest-integrated-gate-storage-blacklist.txt
-              - ^tools/tempest-integrated-gate-storage-exclude-list.txt
-              - ^tools/tempest-extra-tests-list.txt
-              - ^tools/verify-ipv6-only-deployments.sh
-              - ^tools/with_venv.sh
-              # tools/ is not here since this relies on a script in tools/.
+            irrelevant-files: *tempest-irrelevant-files-2
     gate:
       jobs:
         - openstack-tox-pep8