diff --git a/owlbot.py b/owlbot.py
index 0d870e0d7..3f8f5bd66 100644
--- a/owlbot.py
+++ b/owlbot.py
@@ -353,6 +353,7 @@
     microgenerator=True,
     samples=True,
     cov_level=100,
+    unit_test_python_versions=["3.6", "3.7", "3.8", "3.9", "3.10"],
     system_test_external_dependencies=["psutil"],
 )
 s.move(templated_files, excludes=[".coveragerc", ".github/CODEOWNERS"])
diff --git a/setup.py b/setup.py
index e15f06cf5..9749aea2e 100644
--- a/setup.py
+++ b/setup.py
@@ -82,6 +82,8 @@
         "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",
         "Operating System :: OS Independent",
         "Topic :: Internet",
     ],