diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8bb600f..b4a4ffe 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -4,14 +4,17 @@ name: tests
 
 on:
   push:
-    branches: [ master ]
   pull_request:
   schedule:
     - cron: '0 12 * * 0'  # run once a week on Sunday
+  # Allow to run this workflow manually from the Actions tab
+  workflow_dispatch:
 
 jobs:
   build:
     strategy:
+      # We want to see all failures:
+      fail-fast: false
       matrix:
         config:
         # [Python version, tox env]
@@ -31,7 +34,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python
-      uses: actions/setup-python@v2.1.4
+      uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.config[0] }}
     - name: Pip cache
diff --git a/.gitignore b/.gitignore
index 0aadbae..9a9e9b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,16 +10,20 @@
 .installed.cfg
 .mr.developer.cfg
 .tox/
+.vscode/
 __pycache__/
 bin/
 build/
 coverage.xml
 develop-eggs/
+develop/
 dist/
 docs/_build
 eggs/
-htmlcov/
+etc/
 lib/
 lib64
+log/
 parts/
 pyvenv.cfg
+var/
diff --git a/.meta.toml b/.meta.toml
index 04fd283..a49202f 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 = "4e9825189b9b8d18f28e7dbc63373d4baea08602"
+commit-id = "d4e8550e4a37df10866d376fceac4e91689df8c5"
 
 [python]
 with-pypy = true
@@ -16,5 +16,11 @@ fail-under = 87
 
 [manifest]
 additional-rules = [
+    "recursive-include src *.rst",
+    "recursive-include src *.txt",
     "recursive-include src *.xml",
+    "recursive-include src *.zcml",
     ]
+
+[tox]
+use-flake8 = true
diff --git a/MANIFEST.in b/MANIFEST.in
index 81e408e..645b303 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,9 +5,8 @@ include *.txt
 include buildout.cfg
 include tox.ini
 
-recursive-include src *.pt
 recursive-include src *.py
 recursive-include src *.rst
 recursive-include src *.txt
-recursive-include src *.zcml
 recursive-include src *.xml
+recursive-include src *.zcml
diff --git a/tox.ini b/tox.ini
index 8d7e724..ad77b00 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,7 @@
 # Generated from:
 # https://github.com/zopefoundation/meta/tree/master/config/pure-python
 [tox]
+minversion = 3.18
 envlist =
     lint
     py27
@@ -18,7 +19,7 @@ usedevelop = true
 deps =
     zope.testrunner
 commands =
-    zope-testrunner --test-path=src []
+    zope-testrunner --test-path=src {posargs:-vc}
 extras =
     test
 
@@ -36,12 +37,15 @@ commands =
 
 [testenv:coverage]
 basepython = python3
+allowlist_externals =
+    mkdir
 deps =
     coverage
     coverage-python-version
     zope.testrunner
 commands =
-    coverage run -m zope.testrunner --test-path=src []
+    mkdir -p {toxinidir}/parts/htmlcov
+    coverage run -m zope.testrunner --test-path=src {posargs:-vc}
     coverage html
     coverage report -m --fail-under=87
 
@@ -62,4 +66,4 @@ exclude_lines =
     raise AssertionError
 
 [coverage:html]
-directory = htmlcov
+directory = parts/htmlcov