diff --git a/taskcluster/kinds/check/kind.yml b/taskcluster/kinds/check/kind.yml
index 8cf4d63c7..e67233d39 100644
--- a/taskcluster/kinds/check/kind.yml
+++ b/taskcluster/kinds/check/kind.yml
@@ -24,7 +24,7 @@ task-defaults:
 
 tasks:
     ruff-lint:
-        description: "ruff-py311"
+        description: "ruff"
         run:
             using: run-task
             checkout:
@@ -33,7 +33,7 @@ tasks:
             command:
                 - sh
                 - -lxce
-                - uv run tox -e ruff-py311
+                - uv run tox -e ruff
 
     ruff-format:
         description: "ruff-format"
diff --git a/taskcluster/kinds/docker-image/kind.yml b/taskcluster/kinds/docker-image/kind.yml
index 8dc989fb5..8aec1cd59 100644
--- a/taskcluster/kinds/docker-image/kind.yml
+++ b/taskcluster/kinds/docker-image/kind.yml
@@ -10,20 +10,30 @@ transforms:
     - taskgraph.transforms.cached_tasks:transforms
     - taskgraph.transforms.task:transforms
 
+meta:
+    - &py311 "3.11.9"
+    - &py313 "3.13.12"
+    - &uv_version "0.7.15"
+
 tasks:
     python311:
         definition: base-test
         args:
-            PYTHON_VERSION: "3.11.9"
-            UV_VERSION: "0.7.15"
+            PYTHON_VERSION: *py311
+            UV_VERSION: *uv_version
+    python313:
+        definition: base-test
+        args:
+            PYTHON_VERSION: *py313
+            UV_VERSION: *uv_version
 
     # Used by push-image kind
     skopeo: {}
 
     base:
         args:
-            PYTHON_VERSION: "3.11.9"
-            UV_VERSION: "0.7.15"
+            PYTHON_VERSION: *py311
+            UV_VERSION: *uv_version
     addonscript:
         definition: script
         parent: base
@@ -84,18 +94,37 @@ tasks:
     pushapkscript-test-py311:
         definition: base-test
         args:
-            PYTHON_VERSION: "3.11.9"
+            PYTHON_VERSION: *py311
             APT_PACKAGES: default-jdk
 
     pushflatpakscript-test-py311:
         definition: base-test
         args:
-            PYTHON_VERSION: "3.11.9"
+            PYTHON_VERSION: *py311
             # Copied from pushflatpakscript/docker.d/image_setup.sh
             APT_PACKAGES: gir1.2-ostree-1.0 libgirepository1.0-dev ostree
 
     signingscript-test-py311:
         definition: base-test
         args:
-            PYTHON_VERSION: "3.11.9"
+            PYTHON_VERSION: *py311
+            APT_PACKAGES: osslsigncode cmake clang
+
+    pushapkscript-test-py313:
+        definition: base-test
+        args:
+            PYTHON_VERSION: *py313
+            APT_PACKAGES: default-jdk
+
+    pushflatpakscript-test-py313:
+        definition: base-test
+        args:
+            PYTHON_VERSION: *py313
+            # Copied from pushflatpakscript/docker.d/image_setup.sh
+            APT_PACKAGES: gir1.2-ostree-1.0 libgirepository1.0-dev ostree
+
+    signingscript-test-py313:
+        definition: base-test
+        args:
+            PYTHON_VERSION: *py313
             APT_PACKAGES: osslsigncode cmake clang
diff --git a/taskcluster/kinds/tox/kind.yml b/taskcluster/kinds/tox/kind.yml
index b560dcd34..05e1ca0fa 100644
--- a/taskcluster/kinds/tox/kind.yml
+++ b/taskcluster/kinds/tox/kind.yml
@@ -43,7 +43,7 @@ task-defaults:
         - tox.ini
         - uv.lock
     matrix:
-        python: ["311"]
+        python: ["311", "313"]
 
 tasks:
     addonscript:
diff --git a/tox.ini b/tox.ini
index 3e242ad95..1811e23d6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,7 @@ envlist =
     shipitscript-py311
     signingscript-py311
     treescript-py311
-    ruff-py311
+    ruff
 
 skipsdist = true
 
@@ -108,7 +108,91 @@ changedir = {toxinidir}/treescript
 commands =
     tox -e py311
 
-[testenv:ruff-py311]
+[testenv:addonscript-py313]
+changedir = {toxinidir}/addonscript
+commands =
+    tox -e py313
+
+[testenv:balrogscript-py313]
+changedir = {toxinidir}/balrogscript
+commands =
+    tox -e py313
+
+[testenv:beetmoverscript-py313]
+changedir = {toxinidir}/beetmoverscript
+commands =
+    tox -e py313
+
+[testenv:bitrisescript-py313]
+changedir = {toxinidir}/bitrisescript
+commands =
+    tox -e py313
+
+[testenv:bouncerscript-py313]
+changedir = {toxinidir}/bouncerscript
+commands =
+    tox -e py313
+
+[testenv:configloader-py313]
+changedir = {toxinidir}/configloader
+commands =
+    tox -e py313
+
+[testenv:init-py313]
+commands =
+    pytest -n auto tests
+
+[testenv:iscript-py313]
+changedir = {toxinidir}/iscript
+commands =
+    tox -e py313
+
+[testenv:githubscript-py313]
+changedir = {toxinidir}/githubscript
+commands =
+    tox -e py313
+
+[testenv:landoscript-py313]
+changedir = {toxinidir}/landoscript
+commands =
+    tox -e py313
+
+[testenv:pushapkscript-py313]
+changedir = {toxinidir}/pushapkscript
+commands =
+    tox -e py313
+
+[testenv:pushflatpakscript-py313]
+changedir = {toxinidir}/pushflatpakscript
+commands =
+    tox -e py313
+
+[testenv:pushmsixscript-py313]
+changedir = {toxinidir}/pushmsixscript
+commands =
+    tox -e py313
+
+[testenv:scriptworker_client-py313]
+changedir = {toxinidir}/scriptworker_client
+commands =
+    tox -e py313,mypy
+
+[testenv:shipitscript-py313]
+changedir = {toxinidir}/shipitscript
+commands =
+    tox -e py313
+
+[testenv:signingscript-py313]
+changedir = {toxinidir}/signingscript
+commands =
+    tox -e py313
+
+[testenv:treescript-py313]
+changedir = {toxinidir}/treescript
+commands =
+    tox -e py313
+
+[testenv:ruff]
 commands =
     ruff --version
     ruff check --verbose {toxinidir}