diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ec4da6bb..2a2b50dc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -64,9 +64,8 @@ jobs:
             ubuntu_23,
             centos_8,
             centos_9,
-            fedora_36,
-            fedora_37,
-            fedora_38,
+             fedora_38,
+            fedora_39,
           ]
     env:
       DISTRO: ${{matrix.distro}}
diff --git a/test/_fedora_37.Dockerfile b/test/_fedora_37.Dockerfile
deleted file mode 100644
index b4f939ba..00000000
--- a/test/_fedora_37.Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM fedora:37
-RUN dnf install -y git initscripts
-
-ENV GITDIR /etc/.pihole
-ENV SCRIPTDIR /opt/pihole
-
-RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
-ADD . $GITDIR
-RUN cp $GITDIR/advanced/Scripts/*.sh $GITDIR/gravity.sh $GITDIR/pihole $GITDIR/automated\ install/*.sh $SCRIPTDIR/
-ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
-
-RUN true && \
-    chmod +x $SCRIPTDIR/*
-
-ENV SKIP_INSTALL true
-ENV OS_CHECK_DOMAIN_NAME dev-supportedos.pi-hole.net
-
-#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \
diff --git a/test/_fedora_36.Dockerfile b/test/_fedora_39.Dockerfile
similarity index 97%
rename from test/_fedora_36.Dockerfile
rename to test/_fedora_39.Dockerfile
index 847767e7..1727a3aa 100644
--- a/test/_fedora_36.Dockerfile
+++ b/test/_fedora_39.Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:36
+FROM fedora:39
 RUN dnf install -y git initscripts
 
 ENV GITDIR /etc/.pihole
diff --git a/test/tox.fedora_36.ini b/test/tox.fedora_36.ini
deleted file mode 100644
index 1896a45f..00000000
--- a/test/tox.fedora_36.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[tox]
-envlist = py3
-
-[testenv:py3]
-allowlist_externals = docker
-deps = -rrequirements.txt
-commands = docker buildx build --load --progress plain -f _fedora_36.Dockerfile -t pytest_pihole:test_container ../
-           pytest {posargs:-vv -n auto} ./test_any_automated_install.py ./test_any_utils.py ./test_centos_fedora_common_support.py
diff --git a/test/tox.fedora_37.ini b/test/tox.fedora_39.ini
similarity index 84%
rename from test/tox.fedora_37.ini
rename to test/tox.fedora_39.ini
index 9c8752cc..5c8557c9 100644
--- a/test/tox.fedora_37.ini
+++ b/test/tox.fedora_39.ini
@@ -4,5 +4,5 @@ envlist = py3
 [testenv]
 allowlist_externals = docker
 deps = -rrequirements.txt
-commands = docker buildx build --load --progress plain -f _fedora_37.Dockerfile -t pytest_pihole:test_container ../
+commands = docker buildx build --load --progress plain -f _fedora_39.Dockerfile -t pytest_pihole:test_container ../
            pytest {posargs:-vv -n auto} ./test_any_automated_install.py ./test_any_utils.py ./test_centos_fedora_common_support.py