diff --git a/config/c-code/packages.txt b/config/c-code/packages.txt
index 5df55bc..2f666b9 100644
--- a/config/c-code/packages.txt
+++ b/config/c-code/packages.txt
@@ -11,3 +11,4 @@ Acquisition
 zope.proxy
 Persistence
 zope.security
+zope.container
diff --git a/config/c-code/tests-strategy.j2 b/config/c-code/tests-strategy.j2
index ff23c65..d4427c2 100644
--- a/config/c-code/tests-strategy.j2
+++ b/config/c-code/tests-strategy.j2
@@ -1,4 +1,5 @@
     strategy:
+      fail-fast: false
       matrix:
         python-version:
 {% if with_legacy_python %}
diff --git a/config/c-code/tests.yml.j2 b/config/c-code/tests.yml.j2
index c873f6b..cbd1ad5 100644
--- a/config/c-code/tests.yml.j2
+++ b/config/c-code/tests.yml.j2
@@ -146,7 +146,7 @@ jobs:
 {% else %}
       - name: Install %(package_name)s
         run: |
-          pip install -U wheel
+          pip install -U wheel setuptools
           pip install -U coverage coverage-python-version
           pip install -U 'faulthandler; python_version == "2.7" and platform_python_implementation == "CPython"'
           # Unzip into src/ so that testrunner can find the .so files