diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
index be8632b360..4b8bbc66ff 100644
--- a/.github/workflows/core.yml
+++ b/.github/workflows/core.yml
@@ -7,8 +7,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, windows-latest, macos-latest]
-        python-version: ["3.6", "3.7", "3.11", "3.12"]
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        python-version: ["3.6", "3.7", "3.11", "3.12", "3.13.0-rc.2"]
         exclude:
           - os: macos-latest
             python-version: "3.6"
@@ -23,7 +23,7 @@ jobs:
           submodules: "recursive"
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -37,7 +37,7 @@ jobs:
           tox -e py
 
       - name: Python Lint
-        if: ${{ matrix.python-version != '3.6' }}
+        if: ${{ matrix.python-version != '3.6' && matrix.python-version != '3.7' }}
         run: |
           tox -e lint
 
diff --git a/HISTORY.rst b/HISTORY.rst
index 2312184905..b4b5fc529f 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -21,6 +21,7 @@ test-driven methodologies, and modern toolchains for unrivaled success.
 6.1.16 (2024-??-??)
 ~~~~~~~~~~~~~~~~~~~
 
+* Added support for Python 3.13
 * Introduced the `PLATFORMIO_SYSTEM_TYPE <https://docs.platformio.org/en/latest/envvars.html#envvar-PLATFORMIO_SYSTEM_TYPE>`__ environment variable, enabling manual override of the detected system type for greater flexibility and control in custom build environments
 * Enhanced internet connection checks by falling back to HTTPS protocol when HTTP (port 80) fails (`issue #4980 <https://github.com/platformio/platformio-core/issues/4980>`_)
 * Upgraded the build engine to the latest version of SCons (4.8.1) to improve build performance, reliability, and compatibility with other tools and systems (`release notes <https://github.com/SCons/scons/releases/tag/4.8.1>`__)
diff --git a/tests/commands/pkg/test_install.py b/tests/commands/pkg/test_install.py
index 2c62331409..0b837993ea 100644
--- a/tests/commands/pkg/test_install.py
+++ b/tests/commands/pkg/test_install.py
@@ -446,7 +446,7 @@ def test_custom_project_libraries(
         )
         assert pkgs_to_specs(lm.get_installed()) == [
             PackageSpec("ArduinoJson@5.13.4"),
-            PackageSpec("Nanopb@0.4.8"),
+            PackageSpec("Nanopb@0.4.9"),
         ]
         assert config.get("env:devkit", "lib_deps") == [
             "bblanchon/ArduinoJson@^5",