diff --git a/setup.py b/setup.py
index 19e08cf89..b361aad66 100644
--- a/setup.py
+++ b/setup.py
@@ -12,8 +12,8 @@ def recursive_files(directory):
                 paths.append(os.path.join('..', path, filename))
     return paths
 
-if sys.version_info < (3, 6):
-    raise RuntimeError("Thonny requires Python 3.6 or later")
+if sys.version_info < (3, 8):
+    raise RuntimeError("Thonny requires Python 3.8 or later")
 
 setupdir = os.path.dirname(__file__)
 
@@ -55,6 +55,8 @@ def recursive_files(directory):
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Topic :: Education",
         "Topic :: Software Development",
         "Topic :: Software Development :: Debuggers",
diff --git a/thonny/plugins/cpython_frontend/cp_front.py b/thonny/plugins/cpython_frontend/cp_front.py
index a6374faf5..f4db2791c 100644
--- a/thonny/plugins/cpython_frontend/cp_front.py
+++ b/thonny/plugins/cpython_frontend/cp_front.py
@@ -350,7 +350,7 @@ def _get_interpreters():
         # registry
         result.update(_get_interpreters_from_windows_registry())
 
-        for minor in [7, 8, 9, 10, 11]:
+        for minor in [8, 9, 10, 11, 12]:
             for dir_ in [
                 "C:\\Python3%d" % minor,
                 "C:\\Python3%d-32" % minor,
@@ -471,9 +471,6 @@ def _get_interpreters_from_windows_registry():
     result = set()
     for key in [winreg.HKEY_LOCAL_MACHINE, winreg.HKEY_CURRENT_USER]:
         for version in [
-            "3.6",
-            "3.6-32",
-            "3.6-64",
             "3.8",
             "3.8-32",
             "3.8-64",