diff --git a/agent/test-constraints-3.6.txt b/agent/test-constraints-3.6.txt
new file mode 100644
index 0000000000..7614eac603
--- /dev/null
+++ b/agent/test-constraints-3.6.txt
@@ -0,0 +1,3 @@
+# Python version constraints for P3.6 testing
+python-daemon<3.0.0
+setuptools<60.0.0
diff --git a/jenkins/Makefile b/jenkins/Makefile
index 1e08295466..71f40807af 100644
--- a/jenkins/Makefile
+++ b/jenkins/Makefile
@@ -22,8 +22,7 @@ RPMBUILD_BASEIMAGE_DEFAULTS = \
 	fedora-38 fedora-37 \
 	centos-9 centos-8 centos-7
 
-# All Fedora images are based on Fedora 36
-FEDORA_BASE_IMAGE_REF = quay.io/fedora/fedora:36
+CI_BASE_IMAGE = quay.io/fedora/fedora:38
 
 # Templates for the various distributions' base images.  For the moment, for a
 # given distribution, all of the versions can be found by tweaking the image
@@ -87,7 +86,7 @@ ${_DISTROS:%=image-rpmbuild-%}: image-rpmbuild-%:
 
 ci.fedora.Dockerfile: ci.Dockerfile.j2
 	jinja2 ci.Dockerfile.j2 \
-		-D base_image_ref="${FEDORA_BASE_IMAGE_REF}" \
+		-D base_image_ref="${CI_BASE_IMAGE}" \
 		-D fedora=True \
 		> $@
 
diff --git a/tox.ini b/tox.ini
index c3ee690892..301ea97cd7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -42,6 +42,7 @@ allowlist_externals =
 description = Runs all agent unit tests under Python 3.6
 basepython = python3.6
 deps =
+    -c{toxinidir}/agent/test-constraints-3.6.txt
     -r{toxinidir}/agent/requirements.txt
     -r{toxinidir}/agent/test-requirements.txt