diff --git a/test/constants.py b/test/conftest.py
similarity index 100%
rename from test/constants.py
rename to test/conftest.py
diff --git a/test/run-openshift-pytest b/test/run-openshift-pytest
index d8fbadc0..e47a9a5c 100755
--- a/test/run-openshift-pytest
+++ b/test/run-openshift-pytest
@@ -10,4 +10,4 @@ THISDIR=$(dirname ${BASH_SOURCE[0]})
 
 git show -s
 
-cd "${THISDIR}" && python3.12 -m pytest -s -rA --showlocals -vv test_mariadb_*.py
+cd "${THISDIR}" && python3.12 -m pytest -s -rA --showlocals -vv test_ocp_*.py
diff --git a/test/test_mariadb_imagestream.py b/test/test_ocp_imagestream.py
similarity index 98%
rename from test/test_mariadb_imagestream.py
rename to test/test_ocp_imagestream.py
index c8e2f147..d184ed54 100644
--- a/test/test_mariadb_imagestream.py
+++ b/test/test_ocp_imagestream.py
@@ -6,7 +6,7 @@
 from container_ci_suite.openshift import OpenShiftAPI
 from container_ci_suite.utils import check_variables
 
-from constants import TAGS
+from conftest import TAGS
 
 if not check_variables():
     print("At least one variable from IMAGE_NAME, OS, VERSION is missing.")
diff --git a/test/test_mariadb_imagestream_template.py b/test/test_ocp_imagestream_template.py
similarity index 97%
rename from test/test_mariadb_imagestream_template.py
rename to test/test_ocp_imagestream_template.py
index 3862c227..ade15b1b 100644
--- a/test/test_mariadb_imagestream_template.py
+++ b/test/test_ocp_imagestream_template.py
@@ -6,7 +6,7 @@
 from container_ci_suite.openshift import OpenShiftAPI
 from container_ci_suite.utils import check_variables
 
-from constants import TAGS
+from conftest import TAGS
 
 if not check_variables():
     print("At least one variable from IMAGE_NAME, OS, VERSION is missing.")
diff --git a/test/test_mariadb_latest_imagestreams.py b/test/test_ocp_latest_imagestreams.py
similarity index 100%
rename from test/test_mariadb_latest_imagestreams.py
rename to test/test_ocp_latest_imagestreams.py
diff --git a/test/test_mariadb_local_template.py b/test/test_ocp_local_template.py
similarity index 98%
rename from test/test_mariadb_local_template.py
rename to test/test_ocp_local_template.py
index 7bd2cfa8..c5ba0393 100644
--- a/test/test_mariadb_local_template.py
+++ b/test/test_ocp_local_template.py
@@ -6,7 +6,7 @@
 from container_ci_suite.openshift import OpenShiftAPI
 from container_ci_suite.utils import check_variables
 
-from constants import TAGS
+from conftest import TAGS
 
 if not check_variables():
     print("At least one variable from IMAGE_NAME, OS, VERSION is missing.")
diff --git a/test/test_mariadb_shared_helm_imagestreams.py b/test/test_ocp_shared_helm_imagestreams.py
similarity index 100%
rename from test/test_mariadb_shared_helm_imagestreams.py
rename to test/test_ocp_shared_helm_imagestreams.py
diff --git a/test/test_mariadb_shared_helm_template.py b/test/test_ocp_shared_helm_template.py
similarity index 98%
rename from test/test_mariadb_shared_helm_template.py
rename to test/test_ocp_shared_helm_template.py
index 99cd8fdf..676b1253 100644
--- a/test/test_mariadb_shared_helm_template.py
+++ b/test/test_ocp_shared_helm_template.py
@@ -5,7 +5,7 @@
 
 from container_ci_suite.helm import HelmChartsAPI
 
-from constants import TAGS
+from conftest import TAGS
 test_dir = Path(os.path.abspath(os.path.dirname(__file__)))
 
 VERSION = os.getenv("VERSION")