diff --git a/.zuul.yaml b/.zuul.yaml
index c95e4d691..1521b21ff 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -16,7 +16,6 @@
 - project:
     templates:
       - docs-on-readthedocs
-      - openstack-python36-jobs-no-constraints
       - openstack-python37-jobs-no-constraints
       - openstack-python38-jobs-no-constraints
     vars:
diff --git a/setup.cfg b/setup.cfg
index 8836bdfd3..67be088ee 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,7 +22,6 @@ classifier =
     Operating System :: OS Independent
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
 
diff --git a/tox.ini b/tox.ini
index 095dd4a81..9688584c4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.2
-envlist = linters, docs, docs-linkcheck, py36, py37, py38, cover
+envlist = linters, docs, docs-linkcheck, py37, py38, cover
 skip_missing_interpreters = true
 # custom vars (no meaning to tox)
 install_test_deps = pip install -q -r test-requirements.txt