diff --git a/.travis.yml b/.travis.yml
index 88aa21e5..84c42c1d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,14 +25,10 @@ matrix:
       env: DOCKER="fedora-31-amd64"
     - name: "fedora-32-amd64 stable"
       env: DOCKER="fedora-32-amd64"
-    - name: "ubuntu-16.04-xenial-amd64 stable"
-      env: DOCKER="ubuntu-16.04-xenial-amd64"
     - name: "ubuntu-18.04-bionic-amd64 stable"
       env: DOCKER="ubuntu-18.04-bionic-amd64"
     - name: "ubuntu-20.04-focal-amd64 stable"
       env: DOCKER="ubuntu-20.04-focal-amd64"
-    - name: "debian-9-stretch-x86 stable"
-      env: DOCKER="debian-9-stretch-x86"
     - name: "debian-10-buster-x86 stable"
       env: DOCKER="debian-10-buster-x86"
     - name: "alpine latest"
@@ -53,14 +49,10 @@ matrix:
       env: DOCKER="fedora-31-amd64" LATEST="true"
     - name: "fedora-32-amd64 latest"
       env: DOCKER="fedora-32-amd64" LATEST="true"
-    - name: "ubuntu-16.04-xenial-amd64 latest"
-      env: DOCKER="ubuntu-16.04-xenial-amd64" LATEST="true"
     - name: "ubuntu-18.04-bionic-amd64 latest"
       env: DOCKER="ubuntu-18.04-bionic-amd64" LATEST="true"
     - name: "ubuntu-20.04-focal-amd64 latest"
       env: DOCKER="ubuntu-20.04-focal-amd64" LATEST="true"
-    - name: "debian-9-stretch-x86 latest"
-      env: DOCKER="debian-9-stretch-x86" LATEST="true"
     - name: "debian-10-buster-x86 latest"
       env: DOCKER="debian-10-buster-x86" LATEST="true"
 install:
diff --git a/Makefile b/Makefile
index c88372d4..3c617636 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-TARGETS = alpine arch amazon-1-amd64 amazon-2-amd64 ubuntu-16.04-xenial-amd64 ubuntu-18.04-bionic-amd64 ubuntu-20.04-focal-amd64 debian-9-stretch-x86 debian-10-buster-x86 fedora-31-amd64 fedora-32-amd64 centos-6-amd64 centos-7-amd64 centos-8-amd64
+TARGETS = alpine arch amazon-1-amd64 amazon-2-amd64 ubuntu-18.04-bionic-amd64 ubuntu-20.04-focal-amd64 debian-10-buster-x86 fedora-31-amd64 fedora-32-amd64 centos-6-amd64 centos-7-amd64 centos-8-amd64
 
 
 BUILDDIRS = $(TARGETS:%=build-%)
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 978d6c67..c7753916 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -33,8 +33,9 @@ ADD depends /depends
 RUN cd /depends && ./install_webp.sh && ./install_imagequant.sh && ./install_raqm.sh
 
 RUN /usr/sbin/adduser -D pillow && \
-    pip3 install virtualenv && virtualenv /vpy3 && \
+    pip3 install -I virtualenv && virtualenv /vpy3 && \
     /vpy3/bin/pip install --upgrade pip && \
+    /vpy3/bin/pip install --upgrade setuptools>=49.3.2 && \
     /vpy3/bin/pip install olefile pytest pytest-cov && \
     /vpy3/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy3
diff --git a/amazon-2-amd64/Dockerfile b/amazon-2-amd64/Dockerfile
index 8dab82f7..f3e103e5 100644
--- a/amazon-2-amd64/Dockerfile
+++ b/amazon-2-amd64/Dockerfile
@@ -16,6 +16,7 @@ RUN useradd --uid 1000 pillow
 RUN bash -c "/usr/bin/pip3 install virtualenv && \
     /usr/bin/python3 -mvirtualenv -p /usr/bin/python3 --system-site-packages /vpy3 && \
     /vpy3/bin/pip install --upgrade pip && \
+    /vpy3/bin/pip install --upgrade setuptools>=49.3.2 && \
     /vpy3/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy3/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy3"
diff --git a/debian-9-stretch-x86/Dockerfile b/archive/debian-9-stretch-x86/Dockerfile
similarity index 100%
rename from debian-9-stretch-x86/Dockerfile
rename to archive/debian-9-stretch-x86/Dockerfile
diff --git a/debian-9-stretch-x86/LICENSE b/archive/debian-9-stretch-x86/LICENSE
similarity index 100%
rename from debian-9-stretch-x86/LICENSE
rename to archive/debian-9-stretch-x86/LICENSE
diff --git a/debian-9-stretch-x86/Makefile b/archive/debian-9-stretch-x86/Makefile
similarity index 100%
rename from debian-9-stretch-x86/Makefile
rename to archive/debian-9-stretch-x86/Makefile
diff --git a/debian-9-stretch-x86/README.txt b/archive/debian-9-stretch-x86/README.txt
similarity index 100%
rename from debian-9-stretch-x86/README.txt
rename to archive/debian-9-stretch-x86/README.txt
diff --git a/debian-9-stretch-x86/test.sh b/archive/debian-9-stretch-x86/test.sh
similarity index 100%
rename from debian-9-stretch-x86/test.sh
rename to archive/debian-9-stretch-x86/test.sh
diff --git a/debian-9-stretch-x86/update.sh b/archive/debian-9-stretch-x86/update.sh
similarity index 100%
rename from debian-9-stretch-x86/update.sh
rename to archive/debian-9-stretch-x86/update.sh
diff --git a/ubuntu-16.04-xenial-amd64/Dockerfile b/archive/ubuntu-16.04-xenial-amd64/Dockerfile
similarity index 100%
rename from ubuntu-16.04-xenial-amd64/Dockerfile
rename to archive/ubuntu-16.04-xenial-amd64/Dockerfile
diff --git a/ubuntu-16.04-xenial-amd64/Makefile b/archive/ubuntu-16.04-xenial-amd64/Makefile
similarity index 100%
rename from ubuntu-16.04-xenial-amd64/Makefile
rename to archive/ubuntu-16.04-xenial-amd64/Makefile
diff --git a/ubuntu-16.04-xenial-amd64/test.sh b/archive/ubuntu-16.04-xenial-amd64/test.sh
similarity index 100%
rename from ubuntu-16.04-xenial-amd64/test.sh
rename to archive/ubuntu-16.04-xenial-amd64/test.sh
diff --git a/ubuntu-16.04-xenial-amd64/update.sh b/archive/ubuntu-16.04-xenial-amd64/update.sh
similarity index 100%
rename from ubuntu-16.04-xenial-amd64/update.sh
rename to archive/ubuntu-16.04-xenial-amd64/update.sh