diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2ca497a..d8889f3 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -26,7 +26,7 @@ jobs:
         - ["3.9",   "py39"]
         - ["3.10",  "py310"]
         - ["3.11",  "py311"]
-        - ["pypy-3.7", "pypy3"]
+        - ["pypy-3.9", "pypy3"]
         - ["3.9",   "docs"]
         - ["3.9",   "coverage"]
 
diff --git a/.meta.toml b/.meta.toml
index 5ed696b..ab91445 100644
--- a/.meta.toml
+++ b/.meta.toml
@@ -2,7 +2,7 @@
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
 [meta]
 template = "pure-python"
-commit-id = "d03ad585"
+commit-id = "66322213"
 
 [python]
 with-pypy = true
@@ -34,6 +34,7 @@ testenv-setenv = [
 
 [manifest]
 additional-rules = [
+    "include *.yaml",
     "recursive-include src *.js",
     "recursive-include src *.pt",
     "recursive-include src *.rst",
diff --git a/MANIFEST.in b/MANIFEST.in
index 7bbe7fd..edeb529 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -12,6 +12,7 @@ recursive-include docs *.txt
 recursive-include docs Makefile
 
 recursive-include src *.py
+include *.yaml
 recursive-include src *.js
 recursive-include src *.pt
 recursive-include src *.rst
diff --git a/setup.cfg b/setup.cfg
index e04ff3c..3834ec9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,7 +24,7 @@ ignore =
 force_single_line = True
 combine_as_imports = True
 sections = FUTURE,STDLIB,THIRDPARTY,ZOPE,FIRSTPARTY,LOCALFOLDER
-known_third_party = six, docutils, pkg_resources
+known_third_party = docutils, pkg_resources, pytz
 known_zope =
 known_first_party =
 default_section = ZOPE
diff --git a/src/zope/formlib/form.py b/src/zope/formlib/form.py
index 0316669..dcc9220 100644
--- a/src/zope/formlib/form.py
+++ b/src/zope/formlib/form.py
@@ -22,6 +22,7 @@
 from html import escape
 
 import pytz
+
 import zope.browser.interfaces
 import zope.event
 import zope.i18n
diff --git a/src/zope/formlib/tests/test_formlib.py b/src/zope/formlib/tests/test_formlib.py
index 8d3d88f..285516e 100644
--- a/src/zope/formlib/tests/test_formlib.py
+++ b/src/zope/formlib/tests/test_formlib.py
@@ -14,6 +14,7 @@
 import unittest
 
 import pytz
+
 import zope.interface.common.idatetime
 import zope.publisher.interfaces
 import zope.publisher.interfaces.browser