diff --git a/test/run-openshift-pytest b/test/run-openshift-pytest
index df843e0c..c9817770 100755
--- a/test/run-openshift-pytest
+++ b/test/run-openshift-pytest
@@ -9,5 +9,8 @@
 THISDIR=$(dirname ${BASH_SOURCE[0]})
 
 git show -s
-
-cd "${THISDIR}" && python3.12 -m pytest -s -rA --showlocals -vv test_*.py
+PYTHON_VERSION="3.12"
+if [[ ! -f "/usr/bin/python$PYTHON_VERSION" ]]; then
+  PYTHON_VERSION="3.13"
+fi
+cd "${THISDIR}" && "python$PYTHON_VERSION" -m pytest -s -rA --showlocals -vv test_ocp_*.py
diff --git a/test/test_postgresql_imagestream.py b/test/test_ocp_psql_imagestream.py
similarity index 100%
rename from test/test_postgresql_imagestream.py
rename to test/test_ocp_psql_imagestream.py
diff --git a/test/test_postgresql_imagestream_template.py b/test/test_ocp_psql_imagestream_template.py
similarity index 100%
rename from test/test_postgresql_imagestream_template.py
rename to test/test_ocp_psql_imagestream_template.py
diff --git a/test/test_postgresql_latest_imagestreams.py b/test/test_ocp_psql_latest_imagestreams.py
similarity index 100%
rename from test/test_postgresql_latest_imagestreams.py
rename to test/test_ocp_psql_latest_imagestreams.py
diff --git a/test/test_postgresql_template.py b/test/test_ocp_psql_template.py
similarity index 100%
rename from test/test_postgresql_template.py
rename to test/test_ocp_psql_template.py
diff --git a/test/test_shared_helm_postgresql_imagestreams.py b/test/test_ocp_shared_helm_psql_imagestreams.py
similarity index 100%
rename from test/test_shared_helm_postgresql_imagestreams.py
rename to test/test_ocp_shared_helm_psql_imagestreams.py
diff --git a/test/test_shared_helm_postgresql_template.py b/test/test_ocp_shared_helm_psql_template.py
similarity index 100%
rename from test/test_shared_helm_postgresql_template.py
rename to test/test_ocp_shared_helm_psql_template.py