diff --git a/owlbot.py b/owlbot.py
index fa1b5f1247..775fb46216 100644
--- a/owlbot.py
+++ b/owlbot.py
@@ -81,7 +81,11 @@
 # Add templated files
 # ----------------------------------------------------------------------------
 
-templated_files = common.py_library(cov_level=99, microgenerator=True)
+templated_files = common.py_library(
+    cov_level=99,
+    system_test_python_versions=["3.8"],
+    unit_test_python_versions=["3.6", "3.7", "3.8", "3.9"],
+    microgenerator=True)
 python.py_samples(skip_readmes=True)
 s.move(
     templated_files,
diff --git a/setup.py b/setup.py
index e1602d288a..caa50df32c 100644
--- a/setup.py
+++ b/setup.py
@@ -93,7 +93,6 @@
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
         "Topic :: Internet",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],