diff --git a/test/test_httpd_ex_template.py b/test/test_httpd_ex_template.py
index 080b36a7..d6715a59 100644
--- a/test/test_httpd_ex_template.py
+++ b/test/test_httpd_ex_template.py
@@ -23,7 +23,7 @@ class TestHTTPDExExampleRepo:
 
     def setup_method(self):
         self.template_name = get_service_image(IMAGE_NAME)
-        self.oc_api = OpenShiftAPI(pod_name_prefix=self.template_name, version=VERSION, shared_cluster=True)
+        self.oc_api = OpenShiftAPI(pod_name_prefix=self.template_name, version=VERSION)
 
     def teardown_method(self):
         self.oc_api.delete_project()
@@ -34,7 +34,7 @@ def test_httpd_ex_template_inside_cluster(self):
             app=f"https://github.com/sclorg/httpd-ex#{BRANCH_TO_TEST}",
             context="."
         )
-        assert self.oc_api.template_deployed(name_in_template=self.template_name)
+        assert self.oc_api.is_template_deployed(name_in_template=self.template_name)
         assert self.oc_api.check_response_inside_cluster(
             name_in_template=self.template_name, expected_output="Welcome to your static httpd"
         )
diff --git a/test/test_httpd_imagestream_s2i.py b/test/test_httpd_imagestream_s2i.py
index 76603ce5..6f9bd740 100644
--- a/test/test_httpd_imagestream_s2i.py
+++ b/test/test_httpd_imagestream_s2i.py
@@ -20,7 +20,7 @@ class TestHTTPDImagestreamS2I:
 
     def setup_method(self):
         self.template_name = get_service_image(IMAGE_NAME)
-        self.oc_api = OpenShiftAPI(pod_name_prefix=self.template_name, version=VERSION, shared_cluster=True)
+        self.oc_api = OpenShiftAPI(pod_name_prefix=self.template_name, version=VERSION)
 
     def teardown_method(self):
         self.oc_api.delete_project()
@@ -33,9 +33,10 @@ def test_inside_cluster(self):
             imagestream_file=f"imagestreams/httpd-{os_name}.json",
             image_name=IMAGE_NAME,
             app="https://github.com/sclorg/httpd-container.git",
-            context="examples/sample-test-app"
+            context="examples/sample-test-app",
+            service_name=self.template_name
         )
-        assert self.oc_api.template_deployed(name_in_template=self.template_name)
+        assert self.oc_api.is_s2i_pod_running(pod_name_prefix=self.template_name)
         assert self.oc_api.check_response_inside_cluster(
             name_in_template=self.template_name, expected_output="This is a sample s2i application with static content"
         )
diff --git a/test/test_httpd_integration.py b/test/test_httpd_integration.py
index dff52c4f..e7cc978e 100644
--- a/test/test_httpd_integration.py
+++ b/test/test_httpd_integration.py
@@ -20,7 +20,7 @@ class TestHTTPDIntegrationTemplate:
 
     def setup_method(self):
         self.template_name = get_service_image(IMAGE_NAME)
-        self.oc_api = OpenShiftAPI(pod_name_prefix=self.template_name, version=VERSION, shared_cluster=True)
+        self.oc_api = OpenShiftAPI(pod_name_prefix=self.template_name, version=VERSION)
 
     def teardown_method(self):
         self.oc_api.delete_project()
@@ -31,7 +31,7 @@ def test_httpd_ex_template_inside_cluster(self):
             app=f"https://github.com/sclorg/httpd-container.git",
             context="examples/sample-test-app"
         )
-        assert self.oc_api.template_deployed(name_in_template=self.template_name)
+        assert self.oc_api.is_template_deployed(name_in_template=self.template_name)
         assert self.oc_api.check_response_inside_cluster(
             name_in_template=self.template_name, expected_output="This is a sample s2i application with static content"
         )