diff --git a/.zuul.yaml b/.zuul.yaml
index 89b8fd17..f6dcb97e 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -13,7 +13,6 @@
 - project:
     templates:
       - docs-on-readthedocs
-      - openstack-python35-jobs
       - openstack-python36-jobs
     vars:
       rtd_webhook_id: '38576'
@@ -88,6 +87,7 @@
 
 - job:
     name: airship-shipyard-image-gate-ubuntu_xenial
+    voting: false
     description: |
       Run shipyard-image build for ubuntu_xenial.
     parent: airship-shipyard-image-base
@@ -146,6 +146,7 @@
 
 - job:
     name: airship-shipyard-docker-build-post-ubuntu_xenial
+    voting: false
     timeout: 1800
     run: tools/gate/playbooks/run-image.yaml
     nodeset: airship-shipyard-single-node
diff --git a/src/bin/shipyard_airflow/tox.ini b/src/bin/shipyard_airflow/tox.ini
index 5c981018..5a8272b7 100644
--- a/src/bin/shipyard_airflow/tox.ini
+++ b/src/bin/shipyard_airflow/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 skipsdist=True
-envlist = py35, py36, pep8, bandit
+envlist = py36, pep8, bandit
 
 [testenv]
 setenv=
@@ -9,21 +9,6 @@ setenv=
   LC_ALL=C.UTF-8
 deps = -r{toxinidir}/requirements.txt
 
-[testenv:py35]
-skipsdist=True
-setenv=
-  SLUGIFY_USES_TEXT_UNIDECODE=yes
-commands =
-  pip install -r{toxinidir}/test-requirements.txt
-  airflow initdb
-  pytest \
-    {posargs} \
-    --cov-branch \
-    --cov-report=term-missing:skip-covered \
-    --cov-config=.coveragerc \
-    --cov=shipyard_airflow \
-    --cov-report=html
-
 [testenv:py36]
 skipsdist=True
 setenv=
diff --git a/src/bin/shipyard_client/tox.ini b/src/bin/shipyard_client/tox.ini
index 256f569e..12464ead 100644
--- a/src/bin/shipyard_client/tox.ini
+++ b/src/bin/shipyard_client/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 skipsdist=True
-envlist = py35, py36, pep8, bandit
+envlist = py36, pep8, bandit
 
 [testenv]
 setenv=
@@ -10,17 +10,6 @@ setenv=
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 
-[testenv:py35]
-skipsdist=True
-commands =
-  pytest \
-    {posargs} \
-    --cov-branch \
-    --cov-report=term-missing:skip-covered \
-    --cov-config=.coveragerc \
-    --cov=shipyard_client \
-    --cov-report=html
-
 [testenv:py36]
 skipsdist=True
 commands =
diff --git a/tox.ini b/tox.ini
index 8774b4a3..a9cffbf9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -34,13 +34,6 @@ commands=
   tox -c {toxinidir}/src/bin/shipyard_airflow/tox.ini
   tox -c {toxinidir}/src/bin/shipyard_client/tox.ini
 
-[testenv:py35]
-whitelist_externals=
-    tox
-commands=
-  tox -c {toxinidir}/src/bin/shipyard_airflow/tox.ini -e py35
-  tox -c {toxinidir}/src/bin/shipyard_client/tox.ini -e py35
-
 [testenv:py36]
 whitelist_externals=
     tox