diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d73f120e..0a9cee8f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,8 +30,8 @@ jobs:
           - "debian-11-bullseye-amd64"
           - "debian-12-bookworm-x86"
           - "debian-12-bookworm-amd64"
-          - "fedora-38-amd64"
           - "fedora-39-amd64"
+          - "fedora-40-amd64"
           - "gentoo"
           - "ubuntu-20.04-focal-amd64"
           - "ubuntu-22.04-jammy-amd64-valgrind"
diff --git a/Makefile b/Makefile
index dcad27fa..0d83fb05 100644
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,8 @@ TARGETS = \
 	debian-11-bullseye-amd64 \
 	debian-12-bookworm-x86 \
 	debian-12-bookworm-amd64 \
-	fedora-38-amd64 \
 	fedora-39-amd64 \
+	fedora-40-amd64 \
 	gentoo \
 	manylinux2014-wheel-build \
 	manylinux_2_28-wheel-build \
diff --git a/fedora-38-amd64/Dockerfile b/archive/fedora-38-amd64/Dockerfile
similarity index 100%
rename from fedora-38-amd64/Dockerfile
rename to archive/fedora-38-amd64/Dockerfile
diff --git a/fedora-38-amd64/Makefile b/archive/fedora-38-amd64/Makefile
similarity index 100%
rename from fedora-38-amd64/Makefile
rename to archive/fedora-38-amd64/Makefile
diff --git a/fedora-38-amd64/test.sh b/archive/fedora-38-amd64/test.sh
similarity index 100%
rename from fedora-38-amd64/test.sh
rename to archive/fedora-38-amd64/test.sh
diff --git a/fedora-38-amd64/update.sh b/archive/fedora-38-amd64/update.sh
similarity index 100%
rename from fedora-38-amd64/update.sh
rename to archive/fedora-38-amd64/update.sh
diff --git a/fedora-40-amd64/Dockerfile b/fedora-40-amd64/Dockerfile
new file mode 100644
index 00000000..9e72e9b6
--- /dev/null
+++ b/fedora-40-amd64/Dockerfile
@@ -0,0 +1,42 @@
+FROM fedora:40
+
+RUN dnf install -y \
+    freetype-devel \
+    fribidi-devel \
+    gcc \
+    harfbuzz-devel \
+    lcms2-devel \
+    libimagequant-devel \
+    libjpeg-devel \
+    libraqm-devel \
+    libtiff-devel \
+    libwebp-devel \
+    make \
+    openjpeg2-devel \
+    python3-devel \
+    python3-tkinter \
+    python3-virtualenv \
+    redhat-rpm-config \
+    tcl-devel \
+    tk-devel \
+    util-linux \
+    which \
+    xorg-x11-server-Xvfb \
+    zlib-devel \
+    && dnf clean all
+
+RUN useradd pillow \
+    && chown pillow:pillow /home/pillow
+
+RUN virtualenv -p /usr/bin/python3.12 --system-site-packages /vpy3 \
+    && /vpy3/bin/pip install --no-cache-dir --upgrade pip \
+    && /vpy3/bin/pip install --no-cache-dir cffi olefile pytest pytest-cov pytest-timeout \
+    && /vpy3/bin/pip install --no-cache-dir numpy --only-binary=:all: || true \
+    && chown -R pillow:pillow /vpy3
+
+ADD depends /depends
+
+USER pillow
+CMD ["depends/test.sh"]
+
+#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/fedora-40-amd64
diff --git a/fedora-40-amd64/Makefile b/fedora-40-amd64/Makefile
new file mode 120000
index 00000000..5e7b0e26
--- /dev/null
+++ b/fedora-40-amd64/Makefile
@@ -0,0 +1 @@
+../Makefile.sub
\ No newline at end of file
diff --git a/fedora-40-amd64/test.sh b/fedora-40-amd64/test.sh
new file mode 100755
index 00000000..f1b1726c
--- /dev/null
+++ b/fedora-40-amd64/test.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+source /vpy3/bin/activate
+cd /Pillow
+make clean
+make install-coverage
+python3 -c "from PIL import Image"
+/usr/bin/xvfb-run -a pytest -vx --cov PIL --cov-report term Tests
diff --git a/fedora-40-amd64/update.sh b/fedora-40-amd64/update.sh
new file mode 100755
index 00000000..b51a8526
--- /dev/null
+++ b/fedora-40-amd64/update.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+docker pull fedora:40