diff --git a/Makefile b/Makefile
index a32e4ed..753d871 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,7 @@ SUPPORTED := ubuntu-20.04 \
 	     rockylinux-9 \
 	     rockylinux-10 \
 	     oraclelinux-7 \
+	     amazonlinux-2 \
 	     amazonlinux-2023 \
 	     gentoo
 
@@ -219,18 +220,21 @@ ubuntu-%-install-test:
 	     bash -c 'apt-get update && apt-get install -y /output/$(PACKAGE_NAME)-$(DEB_VERSION)-ubuntu-$*.deb'
 
 # Run an OracleLinux install test (this is for EL7 since CentOS7 images no longer exist)
+oraclelinux-%-install-test: MGR=$(intcmp $*, 7, yum, yum, dnf)
 oraclelinux-%-install-test:
 	docker run --rm \
 	     -v ./$(BUILD_DIR):/output \
-	     oraclelinux:7 \
-	     bash -c 'yum makecache && yum install -y /output/$(PACKAGE_NAME)-$(RPM_VERSION).el7.noarch.rpm'
+	     oraclelinux:$* \
+	     bash -c '$(MGR) makecache && $(MGR) install -y /output/$(PACKAGE_NAME)-$(RPM_VERSION).el7.noarch.rpm'
 
 # Run a Amazon Linux install test
+# Note: AL2 is too old for dnf
+amazonlinux-%-install-test: MGR=$(intcmp $*, 2, yum, yum, dnf)
 amazonlinux-%-install-test:
 	docker run --rm \
 	     -v ./$(BUILD_DIR):/output \
 	     amazonlinux:$* \
-	     bash -c 'dnf makecache && dnf install -y /output/$(PACKAGE_NAME)-$(RPM_VERSION).amzn$*.noarch.rpm'
+	     bash -c '$(MGR) makecache && $(MGR) install -y /output/$(PACKAGE_NAME)-$(RPM_VERSION).amzn$*.noarch.rpm'
 
 # Run a Gentoo install test
 gentoo-install-test:
diff --git a/docker/Dockerfile-amazonlinux b/docker/Dockerfile-amazonlinux
index 7e482ec..8766641 100644
--- a/docker/Dockerfile-amazonlinux
+++ b/docker/Dockerfile-amazonlinux
@@ -8,10 +8,11 @@ FROM ${DISTRO}:${RELEASE}
 ARG DISTRO
 ARG RELEASE
 
-RUN dnf install -y \
+RUN if [ ${RELEASE} -le 2 ] ; then MGR=yum ; else MGR=dnf ; fi && \
+    ${MGR} install -y \
     rpm-build \
     make \
-    && dnf clean all
+    && ${MGR} clean all
 
 RUN echo -e "#!/bin/bash\nmake actually-package-${DISTRO}-${RELEASE}" > /init.sh \
     && chmod 755 /init.sh
diff --git a/docker/Dockerfile-oraclelinux b/docker/Dockerfile-oraclelinux
index dd7e9f8..a8d405d 100644
--- a/docker/Dockerfile-oraclelinux
+++ b/docker/Dockerfile-oraclelinux
@@ -8,11 +8,12 @@ FROM ${DISTRO}:${RELEASE}
 ARG DISTRO
 ARG RELEASE
 
-RUN yum install -y \
+RUN if [ ${RELEASE} -le 7 ] ; then MGR=yum ; else MGR=dnf ; fi && \
+    ${MGR} install -y \
     rpm-build \
     make \
-    oracle-epel-release-el7 \
-    && yum clean all
+    oracle-epel-release-el${RELEASE} \
+    && ${MGR} clean all
 
 RUN echo -e "#!/bin/bash\nmake actually-package-${DISTRO}-${RELEASE}" > /init.sh \
     && chmod 755 /init.sh
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
index fe2a9c8..23d722c 100644
--- a/tests/docker-compose.yml
+++ b/tests/docker-compose.yml
@@ -20,7 +20,7 @@ services:
       POSTGRES_PASSWORD: secret
     healthcheck:
       #test: [ "CMD", "pg_isready", "-U", "postgres" ]
-      test: [ "CMD-SHELL", "pg_controldata /var/lib/postgresql/data/ | grep -q 'in production'" ]
+      test: [ "CMD-SHELL", "pg_controldata $(psql -At -U postgres -c 'show data_directory') | grep -q 'in production'" ]
       interval: 5s
       timeout: 2s
       retries: 40
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 0f1e1a2..0bcc188 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -24,6 +24,7 @@ images["14"]='14-bookworm'
 images["15"]='15-bookworm'
 images["16"]='16-bookworm'
 images["17"]='17-bookworm'
+images["18"]='18-trixie'
 
 declare -A results=()