diff --git a/Makefile b/Makefile
index 97a95a66c..50a857ee4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,3 @@
-.PHONY: test-openshift-4
-test-openshift-4:
-	cd tests && PYTHONPATH=$(CURDIR) python3 -m pytest --verbose --color=yes --showlocals .
\ No newline at end of file
+.PHONY: test-openshift-pytest
+test-openshift-pytest:
+	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest -s -rA --showlocals -vv test_cakephp.py
diff --git a/tests/test_cakephp.py b/tests/test_cakephp.py
index bb5a3d8f4..f16352726 100644
--- a/tests/test_cakephp.py
+++ b/tests/test_cakephp.py
@@ -18,42 +18,18 @@ def setup_method(self):
 		self.oc_api = OpenShiftAPI(pod_name_prefix="cakephp-example")
 		json_raw_file = self.oc_api.get_raw_url_for_json(container="s2i-php-container", dir="imagestreams",
 														 filename="php-rhel.json")
-		self.oc_api.import_is(path=json_raw_file, name="php")
+		self.oc_api.import_is(path=json_raw_file, name="php", skip_check=True)
 
 	def teardown_method(self):
 		self.oc_api.delete_project()
 
-	def test_local_template_inside_cluster(self):
-		branch_to_test = "master"
-		expected_output = "Welcome to PHP"
-		if VERSION.startswith("7.4") or VERSION.startswith("8.0"):
-			branch_to_test = "4.X"
-			expected_output = "Welcome to CakePHP 4"
-		if VERSION.startswith("8.1") or VERSION.startswith("8.2"):
-			branch_to_test = "5.X"
-			expected_output = "Welcome to CakePHP 5"
-
-		template_json = "../openshift/templates/cakephp.json"
-		assert self.oc_api.deploy_template(
-			template=template_json, name_in_template="cakephp-example", expected_output=expected_output,
-			openshift_args=[
-				f"SOURCE_REPOSITORY_REF={branch_to_test}",
-				f"PHP_VERSION={VERSION}",
-				"NAME=cakephp-example"
-			]
-		)
-		assert self.oc_api.template_deployed(name_in_template="cakephp-example")
-		assert self.oc_api.check_response_inside_cluster(
-			name_in_template="cakephp-example", expected_output=expected_output
-		)
-
 	def test_remote_template_inside_cluster(self):
 		branch_to_test = "master"
 		expected_output = "Welcome to PHP"
 		if VERSION.startswith("7.4") or VERSION.startswith("8.0"):
 			branch_to_test = "4.X"
 			expected_output = "Welcome to CakePHP 4"
-		if VERSION.startswith("8.1") or VERSION.startswith("8.2"):
+		if VERSION.startswith("8.1") or VERSION.startswith("8.2") or VERSION.startswith("8.3"):
 			branch_to_test = "5.X"
 			expected_output = "Welcome to CakePHP 5"
 
@@ -64,30 +40,7 @@ def test_remote_template_inside_cluster(self):
 			template=template_json, name_in_template="cakephp-example", expected_output=expected_output,
 			openshift_args=[f"SOURCE_REPOSITORY_REF={branch_to_test}", f"PHP_VERSION={VERSION}", "NAME=cakephp-example"]
 		)
-		assert self.oc_api.template_deployed(name_in_template="cakephp-example")
+		assert self.oc_api.is_template_deployed(name_in_template="cakephp-example")
 		assert self.oc_api.check_response_inside_cluster(
 			name_in_template="cakephp-example", expected_output=expected_output
 		)
-
-	def test_remote_template_by_request(self):
-		branch_to_test = "master"
-		expected_output = "Welcome to PHP"
-		if VERSION.startswith("7.4") or VERSION.startswith("8.0"):
-			branch_to_test = "4.X"
-			expected_output = "Welcome to CakePHP 4"
-		elif VERSION.startswith("8.1") or VERSION.startswith("8.2"):
-			branch_to_test = "5.X"
-			expected_output = "Welcome to CakePHP 5"
-
-		template_json = self.oc_api.get_raw_url_for_json(
-			container="cakephp-ex", branch=branch_to_test, dir="openshift/templates", filename="cakephp.json"
-		)
-		assert self.oc_api.deploy_template(
-			template=template_json, name_in_template="cakephp-example", expected_output=expected_output,
-			openshift_args=[f"SOURCE_REPOSITORY_REF={branch_to_test}", f"PHP_VERSION={VERSION}", "NAME=cakephp-example"]
-		)
-		assert self.oc_api.template_deployed(name_in_template="cakephp-example")
-		assert self.oc_api.check_response_outside_cluster(
-			protocol="https",
-			name_in_template="cakephp-example", expected_output=expected_output
-		)
diff --git a/tests/test_cakephp_mysql.py b/tests/test_cakephp_mysql.py
index f68f9a623..561a995bc 100644
--- a/tests/test_cakephp_mysql.py
+++ b/tests/test_cakephp_mysql.py
@@ -18,48 +18,24 @@ def setup_method(self):
 		self.oc_api = OpenShiftAPI(pod_name_prefix="cakephp-example")
 		json_raw_file = self.oc_api.get_raw_url_for_json(container="s2i-php-container", dir="imagestreams",
 														 filename="php-rhel.json")
-		self.oc_api.import_is(path=json_raw_file, name="php")
+		self.oc_api.import_is(path=json_raw_file, name="php", skip_check=True)
 		json_raw_file = self.oc_api.get_raw_url_for_json(
 			container="mysql-container", dir="imagestreams", filename="mysql-rhel.json"
 		)
-		self.oc_api.import_is(path=json_raw_file, name="mysql")
+		self.oc_api.import_is(path=json_raw_file, name="mysql", skip_check=True)
 
 	def teardown_method(self):
 		self.oc_api.delete_project()
 
-	def test_local_template_inside_cluster(self):
-		branch_to_test = "master"
-		expected_output = "Welcome to PHP"
-		if VERSION.startswith("7.4") or VERSION.startswith("8.0"):
-			branch_to_test = "4.X"
-			expected_output = "Welcome to CakePHP 4"
-		if VERSION.startswith("8.1") or VERSION.startswith("8.2"):
-			branch_to_test = "5.X"
-			expected_output = "Welcome to CakePHP 5"
-		template_json = "../openshift/templates/cakephp-mysql-persistent.json"
-		assert self.oc_api.deploy_template(
-			template=template_json, name_in_template="cakephp-example", expected_output=expected_output,
-			openshift_args=[
-				f"SOURCE_REPOSITORY_REF={branch_to_test}",
-				f"PHP_VERSION={VERSION}",
-				"NAME=cakephp-example",
-				"MYSQL_VERSION=8.0-el8"
-			]
-		)
-		assert self.oc_api.template_deployed(name_in_template="cakephp-example")
-		assert self.oc_api.check_response_inside_cluster(
-			name_in_template="cakephp-example", expected_output=expected_output
-		)
-
 	def test_remote_template_inside_cluster(self):
 		branch_to_test = "master"
 		expected_output = "Welcome to PHP"
 		if VERSION.startswith("7.4") or VERSION.startswith("8.0"):
 			branch_to_test = "4.X"
-			expected_output = "Welcome to CakePHP 4"
-		if VERSION.startswith("8.1") or VERSION.startswith("8.2"):
+			expected_output = "Welcome to CakePHP"
+		if VERSION.startswith("8.1") or VERSION.startswith("8.2") or VERSION.startswith("8.3"):
 			branch_to_test = "5.X"
-			expected_output = "Welcome to CakePHP 5"
+			expected_output = "Welcome to CakePHP"
 
 		template_json = self.oc_api.get_raw_url_for_json(
 			container="cakephp-ex", branch=branch_to_test, dir="openshift/templates", filename="cakephp-mysql-persistent.json"
@@ -70,38 +46,13 @@ def test_remote_template_inside_cluster(self):
 				f"SOURCE_REPOSITORY_REF={branch_to_test}",
 				f"PHP_VERSION={VERSION}",
 				"NAME=cakephp-example",
-                "MYSQL_VERSION=8.0-el8"
+                "MYSQL_VERSION=8.0-el8",
+				"DATABASE_USER=testu",
+				"DATABASE_PASSWORD=testp",
+				"DATABASE_NAME=mysql"
 			]
 		)
-		assert self.oc_api.template_deployed(name_in_template="cakephp-example")
+		assert self.oc_api.is_template_deployed(name_in_template="cakephp-example")
 		assert self.oc_api.check_response_inside_cluster(
 			name_in_template="cakephp-example", expected_output=expected_output
 		)
-
-	def test_remote_template_by_request(self):
-		branch_to_test = "master"
-		expected_output = "Welcome to PHP"
-		if VERSION.startswith("7.4") or VERSION.startswith("8.0"):
-			branch_to_test = "4.X"
-			expected_output = "Welcome to CakePHP 4"
-		elif VERSION.startswith("8.1") or VERSION.startswith("8.2"):
-			branch_to_test = "5.X"
-			expected_output = "Welcome to CakePHP 5"
-
-		template_json = self.oc_api.get_raw_url_for_json(
-			container="cakephp-ex", branch=branch_to_test, dir="openshift/templates", filename="cakephp-mysql-persistent.json"
-		)
-		assert self.oc_api.deploy_template(
-			template=template_json, name_in_template="cakephp-example", expected_output=expected_output,
-			openshift_args=[
-				f"SOURCE_REPOSITORY_REF={branch_to_test}",
-				f"PHP_VERSION={VERSION}",
-				"NAME=cakephp-example",
-                "MYSQL_VERSION=8.0-el8"
-			]
-		)
-		assert self.oc_api.template_deployed(name_in_template="cakephp-example")
-		assert self.oc_api.check_response_outside_cluster(
-			protocol="https",
-			name_in_template="cakephp-example", expected_output=expected_output
-		)