diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 35ed0c30..67377255 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -57,9 +57,9 @@ jobs:
             ubuntu_23,
             centos_8,
             centos_9,
-            fedora_36,
             fedora_37,
             fedora_38,
+            fedora_39,
           ]
     env:
       DISTRO: ${{matrix.distro}}
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_39.ini
similarity index 81%
rename from test/tox.fedora_36.ini
rename to test/tox.fedora_39.ini
index 515487ed..7a538371 100644
--- a/test/tox.fedora_36.ini
+++ b/test/tox.fedora_39.ini
@@ -1,8 +1,8 @@
 [tox]
 envlist = py3
 
-[testenv:py3]
+[testenv]
 allowlist_externals = docker
 deps = -rrequirements.txt
-commands = docker buildx build --load --progress plain -f _fedora_36.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 ./test_fedora_support.py