diff --git a/.zuul.d/python-jobs.yaml b/.zuul.d/python-jobs.yaml
index a086159b36..181322af16 100644
--- a/.zuul.d/python-jobs.yaml
+++ b/.zuul.d/python-jobs.yaml
@@ -48,28 +48,6 @@
     vars:
       tox_env: self
 
-- job:
-    name: rally-tox-py36
-    parent: rally-tox-base
-    description: |
-      Run unit test for rally project.
-
-      Uses tox with the ``py36`` environment.
-    vars:
-      tox_env: py36
-    nodeset: ubuntu-bionic
-
-- job:
-    name: rally-tox-py37
-    parent: rally-tox-base
-    description: |
-      Run unit test for rally project.
-
-      Uses tox with the ``py37`` environment.
-    vars:
-      tox_env: py37
-    nodeset: ubuntu-bionic
-
 - job:
     name: rally-tox-py38
     parent: rally-tox-base
@@ -102,6 +80,16 @@
     vars:
       tox_env: py310
 
+- job:
+    name: rally-tox-py311
+    parent: rally-tox-base
+    description: |
+      Run unit test for rally project.
+
+      Uses tox with the ``py311`` environment.
+    vars:
+      tox_env: py311
+
 - job:
     name: rally-tox-samples
     parent: rally-tox-base
diff --git a/.zuul.d/zuul.yaml b/.zuul.d/zuul.yaml
index 110b3f93f1..ac678177e6 100644
--- a/.zuul.d/zuul.yaml
+++ b/.zuul.d/zuul.yaml
@@ -9,11 +9,10 @@
         - rally-tox-cover
         - rally-tox-docs
         - rally-tox-pep8
-        - rally-tox-py36
-        - rally-tox-py37
         - rally-tox-py38
         - rally-tox-py39
         - rally-tox-py310
+        - rally-tox-py311
         - rally-tox-samples
         - rally-tox-functional
         - rally-tox-self
@@ -27,11 +26,10 @@
         - rally-tox-cover
         - rally-tox-docs
         - rally-tox-pep8
-        - rally-tox-py36
-        - rally-tox-py37
         - rally-tox-py38
         - rally-tox-py39
         - rally-tox-py310
+        - rally-tox-py311
         - rally-tox-functional
         - rally-tox-self
         - rally-install-ubuntu-focal
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 677b251e30..2de167a2fa 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -17,6 +17,20 @@ Changelog
 .. Release notes for existing releases are MUTABLE! If there is something that
    was missed or can be improved, feel free to change it!
 
+[unreleased]
+------------
+
+Added
+~~~~~
+
+* CI checks for Python 3.11 compatibility
+
+
+Removed
+~~~~~~~
+
+* Support for Python 3.6 and Python 3.7
+
 [3.4.0] - 2023-05-23
 --------------------
 
diff --git a/setup.cfg b/setup.cfg
index fa1fb6c274..cf91a3adad 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,11 +17,10 @@ classifier =
     Programming Language :: Python
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index 5fe03d9a32..4d3a94b7b2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
-minversion = 3.2.0
+minversion = 4.0.0
 ignore_basepython_conflict = true
-envlist = py36,py37,py38,pep8,samples
+envlist = py38,py39,pep8,samples
 
 [testenv]
 extras = {env:RALLY_EXTRAS:}
@@ -38,12 +38,6 @@ passenv =
 commands = flake8
 distribute = false
 
-[testenv:py36]
-basepython = python3.6
-
-[testenv:py37]
-basepython = python3.7
-
 [testenv:py38]
 basepython = python3.8