diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 99ad5b1..e551f16 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,17 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-20.04", "macos-latest"]
-        python: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "pypy-3.9"]
+        python:
+          - "3.6"
+          - "3.7"
+          - "3.8"
+          - "3.9"
+          - "3.10"
+          - "3.11"
+          - "3.12"
+          - "3.13"
+          - "pypy-3.9"
+          - "pypy-3.10"
         include:
           - os: "windows-latest"
             python: "3.8"
@@ -24,6 +34,8 @@ jobs:
             python: "3.11"
           - os: "windows-latest"
             python: "3.12"
+          - os: "windows-latest"
+            python: "3.13"
         exclude:
           - os: "macos-latest"
             python: "3.6"
diff --git a/tox.ini b/tox.ini
index 43c926d..6dd50f2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,9 +3,9 @@
 ; All older versions, and PyPy, lack full symlink support.
 envlist =
     coverage_erase
-    py{38, 39, 310, 311, 312}-all_platforms
+    py{38, 39, 310, 311, 312, 313}-all_platforms
     py{36, 37}-most_platforms
-    pypy3-most_platforms
+    pypy{39, 310}-most_platforms
     coverage_report
 skip_missing_interpreters = true
 
@@ -65,9 +65,11 @@ python =
     3.10: py310-all_platforms
     3.11: py311-all_platforms
     3.12: py312-all_platforms
+    3.13: py313-all_platforms
 
     ; Run on most platforms (Linux and Mac)
-    pypy-3.9: pypy3-most_platforms
+    pypy-3.9: pypy39-most_platforms
+    pypy-3.10: pypy310-most_platforms
     3.6: py36-most_platforms
     3.7: py37-most_platforms