diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
index 623720db..6257376a 100644
--- a/.github/workflows/core.yml
+++ b/.github/workflows/core.yml
@@ -9,11 +9,6 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
         python-version: ["3.6", "3.9", "3.11"]
-        exclude:
-          - os: macos-latest
-            python-version: "3.6"
-          - os: windows-latest
-            python-version: "3.11"
 
     runs-on: ${{ matrix.os }}
 
diff --git a/HISTORY.rst b/HISTORY.rst
index 099cf332..a1a9aec8 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -16,6 +16,7 @@ PlatformIO Core 6
 6.1.6 (2022-??-??)
 ~~~~~~~~~~~~~~~~~~
 
+* Added support for Python 3.11
 * Import the "zeroconf" module only when a user lists mDNS devices (issue with zeroconf's LGPL license)
 
 6.1.5 (2022-11-01)
diff --git a/platformio/compat.py b/platformio/compat.py
index 9cf9161e..17b4cc0a 100644
--- a/platformio/compat.py
+++ b/platformio/compat.py
@@ -85,10 +85,7 @@ def get_filesystem_encoding():
 
 
 def get_locale_encoding():
-    try:
-        return locale.getdefaultlocale()[1]
-    except ValueError:
-        return None
+    return locale.getpreferredencoding()
 
 
 def get_object_members(obj, ignore_private=True):
diff --git a/tox.ini b/tox.ini
index 8972933e..c5cc66d3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,8 +19,8 @@ known_third_party=OpenSSL, SCons, jsonrpc, twisted, zope
 [pytest]
 filterwarnings =
     error
-    # SCons
-    ignore:.*_ImportRedirect.find_spec()
+    # Bottle
+    ignore:.*'cgi' is deprecated and slated for removal
 
 [testenv]
 passenv = *