diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1ed508aa78..5818de41b8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -214,7 +214,7 @@ jobs:
         # flake8 should run on each Python version that we target,
         # because the errors and warnings can differ due to language
         # changes, and we want to catch them all.
-        python_version: ['3.6', '3.7']
+        python_version: ['3.7', '3.8', '3.9', '3.10']
     steps:
       - uses: actions/checkout@50fbc622fc4ef5163becd7fab6573eac35f8462e
       - uses: actions/setup-python@152ba7c4dd6521b8e9c93f72d362ce03bf6c4f20
diff --git a/tensorboard/data/server/pip_package/setup.py b/tensorboard/data/server/pip_package/setup.py
index 2473925345..e55e9521c8 100644
--- a/tensorboard/data/server/pip_package/setup.py
+++ b/tensorboard/data/server/pip_package/setup.py
@@ -32,7 +32,7 @@
             "bin/*",
         ],
     },
-    python_requires=">=3.6",
+    python_requires=">=3.7",
     install_requires=[],
     tests_require=[],
     # PyPI package information. <https://pypi.org/classifiers/>
@@ -43,9 +43,10 @@
         "Intended Audience :: Science/Research",
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Programming Language :: Rust",
         "Topic :: Scientific/Engineering :: Mathematics",
         "Topic :: Software Development :: Libraries :: Python Modules",
diff --git a/tensorboard/pip_package/setup.py b/tensorboard/pip_package/setup.py
index 6f9b7d3085..ec3f50d3b3 100644
--- a/tensorboard/pip_package/setup.py
+++ b/tensorboard/pip_package/setup.py
@@ -64,7 +64,7 @@ def get_readme():
     },
     install_requires=REQUIRED_PACKAGES,
     tests_require=REQUIRED_PACKAGES,
-    python_requires=">=3.6",
+    python_requires=">=3.7",
     # PyPI package information.
     classifiers=[
         "Development Status :: 4 - Beta",
@@ -73,10 +73,10 @@ def get_readme():
         "Intended Audience :: Science/Research",
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3 :: Only",
         "Topic :: Scientific/Engineering :: Mathematics",
         "Topic :: Software Development :: Libraries :: Python Modules",