diff --git a/docker/Dockerfile-tests b/docker/Dockerfile-tests
index 3037e4cc..a57498df 100644
--- a/docker/Dockerfile-tests
+++ b/docker/Dockerfile-tests
@@ -50,9 +50,9 @@ RUN yum -y install \
     && yum clean all
 # We currently require newer versions of these Python packages for the tests.
 # more-itertools is required by pytest, but versions 6.0.0 and up aren't Python 2 compatible
-RUN pip install --upgrade "pytest<5.0" flake8 tox pip "more-itertools<6.0.0" pytest-cov
+RUN pip install --upgrade "pytest<5.0" flake8 tox "more-itertools<6.0.0" pytest-cov "importlib_metadata<=2.0.0" "configparser<5" "importlib_resources<4.0.0"
 # Install zipp as a workaround for https://github.com/pypa/virtualenv/issues/1630
-RUN pip install zipp
+RUN pip install "zipp==1.0.0"
 VOLUME /src
 WORKDIR /src
 ENTRYPOINT ["docker/test.sh"]
diff --git a/docker/Dockerfile-tests-py3 b/docker/Dockerfile-tests-py3
index ab989b65..c689c20d 100644
--- a/docker/Dockerfile-tests-py3
+++ b/docker/Dockerfile-tests-py3
@@ -1,4 +1,4 @@
-FROM fedora:latest
+FROM registry.fedoraproject.org/fedora:latest
 
 WORKDIR /build
 RUN dnf -y install \