diff --git a/src/Dockerfile b/src/Dockerfile
index 13cc091f..bd0b92d6 100644
--- a/src/Dockerfile
+++ b/src/Dockerfile
@@ -11,7 +11,7 @@ FROM {{ spec.s2i_base }}
 #                           PostgreSQL administrative account
 
 ENV POSTGRESQL_VERSION={{ spec.version }} \
-    {% if spec.prod != "rhel8" or spec.prod != "rhel9" or spec.version == "10" %}
+    {% if spec.prod != "rhel8" or spec.prod != "rhel9" or spec.version == "10" or spec.version == "13" %}
     POSTGRESQL_PREV_VERSION={{ spec.prev_version }} \
     {% endif %}
     HOME=/var/lib/pgsql \
diff --git a/test/run_test b/test/run_test
index 84a40c73..e11f0be5 100755
--- a/test/run_test
+++ b/test/run_test
@@ -652,7 +652,7 @@ run_upgrade_test ()
 {
     # Do not run on Fedora or RHEL8 until the upgrade script
     # is fixed for non-SCL use cases
-    { [ "${OS}" == "fedora" ] || [ "${OS}" == "rhel8" ]; } && return 0
+    { [ "${OS}" == "fedora" ]; } && return 0
 
     local upgrade_path="none 9.2 9.4 9.5 9.6 10 12 13 none" prev= act=
     for act in $upgrade_path; do