diff --git a/tox.ini b/tox.ini
index a8c88b4..4967548 100644
--- a/tox.ini
+++ b/tox.ini
@@ -89,31 +89,6 @@ commands =
     bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
 
 
-[testenv:upgrade]
-setenv =
-    {[testenv]setenv}
-    TEST_PLAYBOOK={toxinidir}/tests/test-upgrade.yml
-    CLONE_UPGRADE_TESTS=yes
-commands =
-    bash -c "{toxinidir}/tests/test-zun-upgrades.sh"
-
-
-[testenv:func_lxd]
-setenv =
-    {[testenv]setenv}
-    ANSIBLE_OVERRIDES={toxinidir}/tests/os_zun-overrides-lxd.yml
-commands =
-    bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
-
-
-[testenv:ssl]
-setenv =
-    {[testenv]setenv}
-    ANSIBLE_PARAMETERS=-vvv -e galera_use_ssl=True
-commands =
-    bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
-
-
 [testenv:linters]
 commands =
     bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh"
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index f4fcdf8..911965f 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -14,29 +14,17 @@
 
 - project:
     templates:
-      - openstack-ansible-role-jobs
       - check-requirements
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
     check:
       jobs:
-        # TODO(jrosser) Revert this once centos-7 passes
-        - openstack-ansible-functional-centos-7:
-            voting: false
-        # TODO(jrosser) Revert this once opensuse-423 passes
-        - openstack-ansible-functional-opensuse-423:
-            voting: false
-        # TODO(jrosser) Revet this once bionic passes
-        - openstack-ansible-functional-ubuntu-bionic:
-            voting: false
+        - openstack-ansible-linters
+        - openstack-ansible-functional-ubuntu-xenial
+    experimental:
+      jobs:
+        - openstack-ansible-integrated-deploy-aio
     gate:
       jobs:
-        # TODO(jrosser) Revert this once centos-7 passes
-        - openstack-ansible-functional-centos-7:
-            voting: false
-        # TODO(jrosser) Revert this once opensuse-423 passes
-        - openstack-ansible-functional-opensuse-423:
-            voting: false
-        # TODO(jrosser) Revet this once bionic passes
-        - openstack-ansible-functional-ubuntu-bionic:
-            voting: false
+        - openstack-ansible-linters
+        - openstack-ansible-functional-ubuntu-xenial