diff --git a/.zuul.yaml b/.zuul.yaml
index 541d8e12..f87b3537 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -19,13 +19,11 @@
     check:
       jobs:
         - openstack-tox-pep8
-        - airship-pegleg-tox-py36
         - airship-pegleg-doc-build
         - airship-pegleg-docker-build-gate
     gate:
       jobs:
         - openstack-tox-pep8
-        - airship-pegleg-tox-py36
         - airship-pegleg-doc-build
         - airship-pegleg-docker-build-gate
     post:
@@ -38,20 +36,6 @@
       - name: primary
         label: ubuntu-xenial
 
-- job:
-    name: airship-pegleg-tox-py36
-    description: |
-      Executes unit tests under Python 3.6
-    parent: openstack-tox-py36
-    pre-run:
-      - tools/gate/playbooks/install-cfssl.yaml
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^doc/.*$
-      - ^etc/.*$
-      - ^releasenotes/.*$
-      - ^setup.cfg$
-
 - job:
     name: airship-pegleg-doc-build
     description: |
diff --git a/tools/gate/playbooks/install-cfssl.yaml b/tools/gate/playbooks/install-cfssl.yaml
deleted file mode 100644
index 360888f2..00000000
--- a/tools/gate/playbooks/install-cfssl.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2018 AT&T Intellectual Property.  All other rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- hosts: all
-  gather_facts: False
-  tasks:
-    - name: Install cfssl for Ubuntu
-      shell: |-
-        ./tools/install-cfssl.sh
-      become: yes
-      args:
-          chdir: "{{ zuul.project.src_dir }}"
diff --git a/tox.ini b/tox.ini
index 3a66b14b..a5996e21 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,9 +14,11 @@ deps =
   -r{toxinidir}/test-requirements.txt
 passenv = http_proxy https_proxy HTTP_PROXY HTTPS_PROXY no_proxy NO_PROXY PBR_VERSION
 whitelist_externals =
+  bash
   find
 commands =
   find . -type f -name "*.pyc" -delete
+  bash -c "{toxinidir}/tools/install-cfssl.sh"
   {toxinidir}/tools/gate/run-unit-tests.sh '{posargs}'
 
 [testenv:fmt]