diff --git a/.zuul.yaml b/.zuul.yaml
index 50c23ce7..870b68e7 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -12,7 +12,6 @@
 
 - project:
     templates:
-      - openstack-python35-jobs
       - openstack-python36-jobs
       - openstack-cover-jobs
     check:
diff --git a/Makefile b/Makefile
index 3158331d..f2e71fcd 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ security:
 # Run all unit tests under pegleg
 .PHONY: run_tests
 run_tests:
-	tox -e py35
+	tox -e py36
 
 # Perform Linting
 .PHONY: lint
diff --git a/doc/source/developer-overview.rst b/doc/source/developer-overview.rst
index c4c2671d..a1e5d086 100644
--- a/doc/source/developer-overview.rst
+++ b/doc/source/developer-overview.rst
@@ -72,8 +72,7 @@ Pegleg strives to conform to the `Airship coding conventions`_.
 Python
 ------
 
-The Pegleg code base lives under ``pegleg``. Pegleg supports py35 and py36
-interpreters.
+The Pegleg code base lives under ``pegleg``. Pegleg supports py36 interpreter.
 
 Docker
 ------
@@ -103,8 +102,8 @@ directory):
 
   # Quick way of building a venv and installing all required dependencies into
   # it.
-  tox -e py35 --notest
-  source .tox/py35/bin/activate
+  tox -e py36 --notest
+  source .tox/py36/bin/activate
   pip install -e .
 
   # Now is it possible to run the Pegleg CLI to test local changes:
@@ -129,11 +128,11 @@ Unit Tests
 
 To run all unit tests, execute::
 
-  $ tox -epy35
+  $ tox -epy36
 
 To run unit tests using a regex, execute::
 
-  $ tox -epy35 -- <regex>
+  $ tox -epy36 -- <regex>
 
 .. _Airship: https://airshipit.readthedocs.io
 .. _Deckhand: https://airship-deckhand.readthedocs.io/
diff --git a/tox.ini b/tox.ini
index caa91d22..bb2ce13f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,19 +1,18 @@
 [tox]
-envlist = py35, py36, pep8, docs, cover
+envlist = py36,pep8,docs,cover
 minversion = 2.3.1
-# Allows docs to be built without setup.py having to exist. Requires that
-# usedevelop be False as well (which it is by default).
 skipsdist = True
 
 [testenv]
-setenv = VIRTUAL_ENV={envdir}
-         LANGUAGE=en_US
-         LC_ALL=en_US.utf-8
-passenv = http_proxy https_proxy HTTP_PROXY HTTPS_PROXY
+usedevelop = True
+setenv =
+  VIRTUAL_ENV={envdir}
+  LANGUAGE=en_US
+  LC_ALL=en_US.utf-8
 deps =
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
-basepython=python3
+passenv = http_proxy https_proxy HTTP_PROXY HTTPS_PROXY no_proxy NO_PROXY PBR_VERSION
 whitelist_externals =
   find
 commands =
@@ -21,19 +20,19 @@ commands =
   {toxinidir}/tools/gate/run-unit-tests.sh '{posargs}'
 
 [testenv:fmt]
-basepython=python3
+basepython = python3
 deps =
     -r{toxinidir}/test-requirements.txt
 commands =
     yapf --style=pep8 -ir {toxinidir}/pegleg {toxinidir}/tests
 
 [testenv:pep8]
-basepython=python3
+basepython = python3
 deps =
-    -r{toxinidir}/test-requirements.txt
+  -r{toxinidir}/test-requirements.txt
 commands =
-    flake8 {toxinidir}/pegleg
-    bandit -r pegleg -n 5
+  bandit -r pegleg -n 5
+  flake8 {toxinidir}/pegleg
 
 [testenv:docs]
 basepython = python3
@@ -41,10 +40,12 @@ deps =
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/doc/requirements.txt
 commands =
-  {toxinidir}/tools/gate/build-docs.sh
+  bash -c "{toxinidir}/tools/gate/build-docs.sh"
+whitelist_externals =
+  bash
 
 [testenv:bandit]
-basepython=python3
+basepython = python3
 commands = bandit -r pegleg -n 5
 
 [testenv:cover]