diff --git a/doc/requirements.txt b/doc/requirements.txt
index 90ae115..54fca18 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -3,8 +3,7 @@
 # process, which may cause wedges in the gate later.
 
 sphinxcontrib-apidoc>=0.2.0 # BSD
-sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7'  # BSD
-sphinx!=1.6.6,!=1.6.7,>=1.6.2,!=2.1.0;python_version>='3.4'  # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2,!=2.1.0;  # BSD
 openstackdocstheme>=1.18.1 # Apache-2.0
 
 # releasenotes
diff --git a/setup.cfg b/setup.cfg
index 5da1d1d..3e5d216 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,6 +6,7 @@
 author = OpenStack
 author-email = openstack-discuss@lists.openstack.org
 home-page = https://docs.openstack.org/octavia-tempest-plugin/latest/
+python-requires = >=3.6
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -13,10 +14,11 @@
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
     Programming Language :: Python
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
+    Programming Language :: Python :: Implementation :: CPython
+    Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
 
 [global]
 setup-hooks =
@@ -26,14 +28,6 @@
 packages =
     octavia_tempest_plugin
 
-[build_sphinx]
-source-dir = doc/source
-build-dir = doc/build
-all_files = 1
-
-[upload_sphinx]
-upload-dir = doc/build/html
-
 [compile_catalog]
 directory = octavia_tempest_plugin/locale
 domain = octavia_tempest_plugin
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 3c043d9..60d9150 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -418,16 +418,6 @@
     override-checkout: stable/stein
 
 - job:
-    name: octavia-v2-dsvm-noop-py2-api-stable-rocky
-    parent: octavia-v2-dsvm-noop-py2-api
-    override-checkout: stable/rocky
-
-- job:
-    name: octavia-v2-dsvm-noop-py2-api-stable-queens
-    parent: octavia-v2-dsvm-noop-py2-api
-    override-checkout: stable/queens
-
-- job:
     name: octavia-v2-dsvm-scenario
     parent: octavia-dsvm-live-base
     vars:
@@ -484,16 +474,6 @@
     parent: octavia-v2-dsvm-scenario
     override-checkout: stable/stein
 
-- job:
-    name: octavia-v2-dsvm-py2-scenario-stable-rocky
-    parent: octavia-v2-dsvm-py2-scenario
-    override-checkout: stable/rocky
-
-- job:
-    name: octavia-v2-dsvm-py2-scenario-stable-queens
-    parent: octavia-v2-dsvm-py2-scenario
-    override-checkout: stable/queens
-
 # Legacy jobs for the transition to the act-stdby two node jobs
 - job:
     name: octavia-v2-dsvm-scenario-two-node
@@ -653,16 +633,6 @@
     override-checkout: stable/stein
 
 - job:
-    name: octavia-v2-dsvm-py2-spare-pool-stable-rocky
-    parent: octavia-v2-dsvm-py2-spare-pool
-    override-checkout: stable/rocky
-
-- job:
-    name: octavia-v2-dsvm-py2-spare-pool-stable-queens
-    parent: octavia-v2-dsvm-py2-spare-pool
-    override-checkout: stable/queens
-
-- job:
     name: octavia-v2-dsvm-cinder-amphora
     parent: octavia-v2-dsvm-scenario
     required-projects:
@@ -771,16 +741,6 @@
               amphora_ssh_user: centos
 
 - job:
-    name: octavia-v2-act-stdby-iptables-dsvm-py2-scenario-stable-rocky
-    parent: octavia-v2-act-stdby-iptables-dsvm-py2-scenario
-    override-checkout: stable/rocky
-
-- job:
-    name: octavia-v2-act-stdby-iptables-dsvm-py2-scenario-stable-queens
-    parent: octavia-v2-act-stdby-iptables-dsvm-py2-scenario
-    override-checkout: stable/queens
-
-- job:
     name: octavia-v2-act-stdby-dsvm-scenario
     parent: octavia-dsvm-live-base
     vars:
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index be12bba..6b1fcc0 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -11,23 +11,15 @@
         - octavia-v2-dsvm-noop-api
         - octavia-v2-dsvm-noop-api-stable-train
         - octavia-v2-dsvm-noop-api-stable-stein
-        - octavia-v2-dsvm-noop-py2-api-stable-rocky
-        - octavia-v2-dsvm-noop-py2-api-stable-queens
         - octavia-v2-dsvm-scenario
         - octavia-v2-dsvm-scenario-stable-train
         - octavia-v2-dsvm-scenario-stable-stein
-        - octavia-v2-dsvm-py2-scenario-stable-rocky
-        - octavia-v2-dsvm-py2-scenario-stable-queens
         - octavia-v2-dsvm-scenario-ipv6-only:
             voting: false
         - octavia-v2-dsvm-scenario-centos-8:
             voting: false
         - octavia-v2-act-stdby-dsvm-scenario-two-node:
             voting: false
-        - octavia-v2-act-stdby-iptables-dsvm-py2-scenario-stable-rocky:
-            voting: false
-        - octavia-v2-act-stdby-iptables-dsvm-py2-scenario-stable-queens:
-            voting: false
         - octavia-v2-act-stdby-dsvm-scenario:
             voting: false
         - octavia-v2-act-stdby-dsvm-scenario-stable-train:
@@ -40,20 +32,12 @@
             voting: false
         - octavia-v2-dsvm-tls-barbican-stable-stein:
             voting: false
-        - octavia-v2-dsvm-tls-barbican-stable-rocky:
-            voting: false
-        - octavia-v2-dsvm-tls-barbican-stable-queens:
-            voting: false
         - octavia-v2-dsvm-spare-pool:
             voting: false
         - octavia-v2-dsvm-spare-pool-stable-train:
             voting: false
         - octavia-v2-dsvm-spare-pool-stable-stein:
             voting: false
-        - octavia-v2-dsvm-py2-spare-pool-stable-rocky:
-            voting: false
-        - octavia-v2-dsvm-py2-spare-pool-stable-queens:
-            voting: false
         - octavia-v2-dsvm-cinder-amphora:
             voting: false
     gate:
@@ -63,10 +47,6 @@
         - octavia-v2-dsvm-noop-api
         - octavia-v2-dsvm-noop-api-stable-train
         - octavia-v2-dsvm-noop-api-stable-stein
-        - octavia-v2-dsvm-noop-py2-api-stable-rocky
-        - octavia-v2-dsvm-noop-py2-api-stable-queens
         - octavia-v2-dsvm-scenario
         - octavia-v2-dsvm-scenario-stable-train
         - octavia-v2-dsvm-scenario-stable-stein
-        - octavia-v2-dsvm-py2-scenario-stable-rocky
-        - octavia-v2-dsvm-py2-scenario-stable-queens