diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index dced168f..942a5e28 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -28,6 +28,9 @@ jobs:
           - name: py312
             python: "3.12"
             toxenv: py312
+          - name: py313
+            python: "3.13"
+            toxenv: py313
           - name: black
             python: "3.12"
             toxenv: black
diff --git a/docs/changelog.md b/docs/changelog.md
index 0bc997b9..7b7ce033 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- Add support for Python 3.13 (#824)
 - Drop support for Python 3.8 (#820)
 - Flag invalid regexes in arguments to functions like
   `re.search` (#816)
diff --git a/setup.py b/setup.py
index a11d085c..8d56be22 100644
--- a/setup.py
+++ b/setup.py
@@ -25,6 +25,7 @@
             "Programming Language :: Python :: 3.10",
             "Programming Language :: Python :: 3.11",
             "Programming Language :: Python :: 3.12",
+            "Programming Language :: Python :: 3.13",
         ],
         keywords="quora static analysis",
         packages=["pyanalyze"],
diff --git a/tox.ini b/tox.ini
index c1b507aa..0dc8a64a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,7 +19,7 @@ commands =
 
 [testenv:ruff]
 deps =
-    ruff==0.2.2
+    ruff==0.6.9
 
 commands =
     ruff check pyanalyze/