diff --git a/owlbot.py b/owlbot.py
index e590b68d..abbbb99a 100644
--- a/owlbot.py
+++ b/owlbot.py
@@ -54,7 +54,11 @@
 # ----------------------------------------------------------------------------
 # Add templated files
 # ----------------------------------------------------------------------------
-templated_files = common.py_library(microgenerator=True, split_system_tests=True,)
+templated_files = common.py_library(
+    microgenerator=True,
+    split_system_tests=True,
+    unit_test_python_versions=["3.6", "3.7", "3.8", "3.9", "3.10"],
+)
 s.move(
     templated_files,
     excludes=["docs/multiprocessing.rst", ".coveragerc", ".github/CODEOOWNERS"],
diff --git a/setup.py b/setup.py
index 19fe7711..6550cea3 100644
--- a/setup.py
+++ b/setup.py
@@ -89,6 +89,7 @@
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Operating System :: OS Independent",
         "Topic :: Internet",
         "Topic :: Software Development :: Libraries :: Python Modules",