diff --git a/.zuul.yaml b/.zuul.yaml
index 9d5156a..25239d9 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -12,15 +12,12 @@
     name: ansible-role-zuul
     parent: ansible-role-zuul-base
 
-- job:
-    name: ansible-role-zuul-fedora-latest
-    parent: ansible-role-zuul
-    nodeset: fedora-latest
-
 - job:
     name: ansible-role-zuul-ubuntu-bionic
     parent: ansible-role-zuul
     nodeset: ubuntu-bionic
+    vars:
+      zuul_pip_version: 3.19.1
 
 # Testing for zuul_install_method: git
 - job:
@@ -32,11 +29,6 @@
       zuul_git_update: false
       zuul_install_method: git
 
-- job:
-    name: ansible-role-zuul-src-fedora-latest
-    parent: ansible-role-zuul-src
-    nodeset: fedora-latest
-
 - job:
     name: ansible-role-zuul-src-ubuntu-bionic
     parent: ansible-role-zuul-src
@@ -44,19 +36,14 @@
 
 - project:
     templates:
-      - windmill-jobs-fedora-latest
       - windmill-jobs-bionic
     check:
       jobs:
-        - ansible-role-zuul-fedora-latest
         - ansible-role-zuul-ubuntu-bionic
-        - ansible-role-zuul-src-fedora-latest
-        - ansible-role-zuul-src-ubuntu-bionic
+        - ansible-role-zuul-src-ubuntu-bionic:
+            voting: false
         - tox-linters
     gate:
       jobs:
-        - ansible-role-zuul-fedora-latest
         - ansible-role-zuul-ubuntu-bionic
-        - ansible-role-zuul-src-fedora-latest
-        - ansible-role-zuul-src-ubuntu-bionic
         - tox-linters
diff --git a/bindep.txt b/bindep.txt
index 1d1b05b..cdc085b 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -14,4 +14,4 @@ python3-setuptools [test]
 # NOTE(pabelanger): This is because of a bug in zuul, when zuul-scheduler starts
 # it will fail unless it cannot connect to zookeeper.  However, zuul should be
 # smart enough to try forever to connect.
-zookeeperd [platform:dpkg]
+zookeeperd [ansible platform:dpkg]
diff --git a/test-requirements.txt b/test-requirements.txt
index 4c4414f..9c62c4e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,2 +1 @@
-ansible-lint
 hacking<0.11,>=0.10
diff --git a/tests/playbooks/pre.yaml b/tests/playbooks/pre.yaml
index 0dce620..f71916b 100644
--- a/tests/playbooks/pre.yaml
+++ b/tests/playbooks/pre.yaml
@@ -26,3 +26,19 @@
         dest: /etc/pip.conf
         regexp: ^extra-index-url
         state: absent
+
+    - name: Execute bindep role
+      include_role:
+        name: bindep
+      vars:
+        bindep_profile: ansible test
+
+    - name: Setup ensure-tox role
+      include_role:
+        name: ensure-tox
+      vars:
+        ensure_global_symlinks: true
+
+    - name: Use the latest version of pip
+      become: true
+      shell: python3 -m pip install -U pip
diff --git a/tox.ini b/tox.ini
index 5f70fca..f0142d3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -35,9 +35,6 @@ whitelist_externals = bash
 commands =
   # PEP8 Lint Check
   flake8
-  # Ansible Lint Check
-  bash -c "find . -not -path '*/\.*' -type f -regex '.*.y[a]?ml' -print0 | \
-    xargs -t -n1 -0 ansible-lint -x 106,306"
   # Ansible Syntax Check
   bash -c "find tests -type f -regex '.*.y[a]?ml' -print | xargs -t -n1 \
     ansible-playbook --syntax-check -i tests/inventory \