diff --git a/.github/common.env b/.github/common.env
index 91f1cb5..3c65591 100644
--- a/.github/common.env
+++ b/.github/common.env
@@ -1,5 +1,5 @@
 # Shared common variables
 
 CI_IMAGE_VERSION=master-1571408207
-CI_TOXENV_ALL=py38,py39,py310,py311,py312
-CI_TOXENV_MASTER=py38-bst-master,py39-bst-master,py310-bst-master,py311-bst-master,py312-bst-master
+CI_TOXENV_ALL=py39,py310,py311,py312,py313
+CI_TOXENV_MASTER=py39-bst-master,py310-bst-master,py311-bst-master,py312-bst-master,py313-bst-master
diff --git a/.github/compose/ci.docker-compose.yml b/.github/compose/ci.docker-compose.yml
index f22b14b..6f69d52 100644
--- a/.github/compose/ci.docker-compose.yml
+++ b/.github/compose/ci.docker-compose.yml
@@ -30,6 +30,10 @@ services:
     <<: *tests-template
     image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:40-${CI_IMAGE_VERSION:-latest}
 
+  fedora-41:
+    <<: *tests-template
+    image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:41-${CI_IMAGE_VERSION:-latest}
+
   ubuntu-22.04:
     <<: *tests-template
     image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-ubuntu:22.04-${CI_IMAGE_VERSION:-latest}
diff --git a/.github/run-ci.sh b/.github/run-ci.sh
index 3b3bb36..eebbbda 100755
--- a/.github/run-ci.sh
+++ b/.github/run-ci.sh
@@ -67,7 +67,7 @@ function runTest() {
 
 
 if [ -z "${test_names}" ]; then
-    for test_name in "mypy debian-11 fedora-40 fedora-missing-deps ubuntu-20.04"; do
+    for test_name in "mypy debian-11 fedora-40 fedora-41 fedora-missing-deps ubuntu-22.04"; do
 	if ! runTest "${test_name}"; then
 	    echo "Tests failed"
 	    exit 1
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d76c512..6cd9c20 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,6 +38,7 @@ jobs:
         test-name:
           - debian-11
           - fedora-40
+          - fedora-41
           - fedora-missing-deps
           - ubuntu-22.04
           - lint
diff --git a/requirements/test-requirements.txt b/requirements/test-requirements.txt
index f922730..646c0bd 100644
--- a/requirements/test-requirements.txt
+++ b/requirements/test-requirements.txt
@@ -8,4 +8,5 @@ pylint
 pycodestyle
 pyftpdlib
 responses
+setuptools
 wheel
diff --git a/setup.py b/setup.py
index 5417244..55bc4d7 100755
--- a/setup.py
+++ b/setup.py
@@ -53,11 +53,11 @@
         "License :: OSI Approved :: Apache Software License",
         "Operating System :: POSIX",
         "Programming Language :: Python :: 3",
-        "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",
+        "Programming Language :: Python :: 3.13",
         "Topic :: Software Development :: Build Tools",
     ],
     description="A collection of plugins for BuildStream.",
diff --git a/tox.ini b/tox.ini
index 5b97c50..3ecd216 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,7 +16,7 @@
 # Tox global configuration
 #
 [tox]
-envlist = py{38,39,310,311,312}-{bst-fixed,bst-master}
+envlist = py{39,310,311,312,313}-{bst-fixed,bst-master}
 skip_missing_interpreters = true
 
 #
@@ -55,14 +55,14 @@ passenv =
 # These keys are not inherited by any other sections
 #
 setenv =
-    py{38,39,310,311,312}: XDG_CACHE_HOME = {envtmpdir}/cache
-    py{38,39,310,311,312}: XDG_CONFIG_HOME = {envtmpdir}/config
-    py{38,39,310,311,312}: XDG_DATA_HOME = {envtmpdir}/share
-    !master: BST_VERSION = 2.2.1
+    py{39,310,311,312,313}: XDG_CACHE_HOME = {envtmpdir}/cache
+    py{39,310,311,312,313}: XDG_CONFIG_HOME = {envtmpdir}/config
+    py{39,310,311,312,313}: XDG_DATA_HOME = {envtmpdir}/share
+    !master: BST_VERSION = 2.4.0
     master: BST_VERSION = master
 
 allowlist_externals =
-    py{38,39,310,311,312}:
+    py{39,310,311,312,313}:
         mv
         mkdir
 	./tests/bzr_wrapper
@@ -106,7 +106,7 @@ skip_install = True
 commands =
     mypy {posargs}
 deps =
-    mypy==1.11.0
+    mypy==1.13.0
     types-protobuf
     types-python-dateutil
     types-setuptools