diff --git a/tox.ini b/tox.ini
index 097716da..b8104fa4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 2.0
 skipsdist = True
-envlist = docs,linters,functional
+envlist = docs,linters
 
 
 [testenv]
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index a1e89ac5..7fb3dcce 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -14,12 +14,12 @@
 
 - project:
     templates:
-      - openstack-ansible-role-jobs
       - check-requirements
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
     check:
       jobs:
+        - openstack-ansible-linters
         - openstack-ansible-ops:elk_metrics_6x-centos-7
         - openstack-ansible-ops:elk_metrics_6x-centos-7-clustered
         - openstack-ansible-ops:elk_metrics_6x-opensuse-423
@@ -35,5 +35,6 @@
         - openstack-ansible-ops:osquery-ubuntu-bionic-clustered
     gate:
       jobs:
+        - openstack-ansible-linters
         - openstack-ansible-ops:elk_metrics_6x-ubuntu-bionic
         - openstack-ansible-ops:osquery-ubuntu-bionic