diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c509b97d2b..2730314fff 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,7 +40,8 @@ jobs:
       fail-fast: false
       matrix:
         tf_version_id: ['tf', 'notf']
-        python_version: ['3.9']
+        # Lower and upper bounds of python versions we intend to support.
+        python_version: ['3.9', '3.13']
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
       - uses: actions/setup-python@13ae5bb136fac2878aff31522b9efb785519f984 # v4.3.0
diff --git a/tensorboard/pip_package/requirements_dev.txt b/tensorboard/pip_package/requirements_dev.txt
index f9a7a3ae70..e09d269376 100644
--- a/tensorboard/pip_package/requirements_dev.txt
+++ b/tensorboard/pip_package/requirements_dev.txt
@@ -19,8 +19,11 @@
 grpcio-testing==1.24.3
 pandas~=2.0
 # For gfile S3 test
-boto3==1.9.86
-moto==1.3.7
+# Python >= 3.13 requires a version after
+# https://github.com/boto/botocore/pull/2794
+# (Both versions picked somewhat arbitrarily after that date)
+boto3==1.33.13
+moto==4.1.9
 # For gfile fsspec test
 fsspec>=2021.06.0
 
diff --git a/tensorboard/pip_package/setup.py b/tensorboard/pip_package/setup.py
index 8bcf841688..14fc7a3c25 100644
--- a/tensorboard/pip_package/setup.py
+++ b/tensorboard/pip_package/setup.py
@@ -76,6 +76,8 @@ def get_readme():
         "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",
         "Programming Language :: Python :: 3 :: Only",
         "Topic :: Scientific/Engineering :: Mathematics",
         "Topic :: Software Development :: Libraries :: Python Modules",