diff --git a/test/test_httpd_ex_template.py b/test/test_httpd_ex_template.py
index 3f2b8fe5..080b36a7 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)
+        self.oc_api = OpenShiftAPI(pod_name_prefix=self.template_name, version=VERSION, shared_cluster=True)
 
     def teardown_method(self):
         self.oc_api.delete_project()
diff --git a/test/test_httpd_shared_helm_imagestreams.py b/test/test_httpd_shared_helm_imagestreams.py
index a019a6ad..938af59f 100644
--- a/test/test_httpd_shared_helm_imagestreams.py
+++ b/test/test_httpd_shared_helm_imagestreams.py
@@ -11,9 +11,9 @@
 class TestHelmRHELHttpdImageStreams:
 
     def setup_method(self):
-        package_name = "httpd-imagestreams"
+        package_name = "redhat-httpd-imagestreams"
         path = test_dir
-        self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir)
+        self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir, shared_cluster=True)
         self.hc_api.clone_helm_chart_repo(
             repo_url="https://github.com/sclorg/helm-charts", repo_name="helm-charts",
             subdir="charts/redhat"
diff --git a/test/test_httpd_shared_helm_template.py b/test/test_httpd_shared_helm_template.py
index ccb05267..b90a31df 100644
--- a/test/test_httpd_shared_helm_template.py
+++ b/test/test_httpd_shared_helm_template.py
@@ -23,7 +23,7 @@
 class TestHelmHTTPDTemplate:
 
     def setup_method(self):
-        package_name = "httpd-template"
+        package_name = "redhat-httpd-template"
         path = test_dir
         self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir)
         self.hc_api.clone_helm_chart_repo(
@@ -40,10 +40,10 @@ def test_package_persistent_by_curl(self):
         new_version = VERSION
         if "micro" in VERSION:
             new_version = VERSION.replace("-micro", "")
-        self.hc_api.package_name = "httpd-imagestreams"
+        self.hc_api.package_name = "redhat-httpd-imagestreams"
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation()
-        self.hc_api.package_name = "httpd-template"
+        self.hc_api.package_name = "redhat-httpd-template"
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation(
             values={
@@ -52,19 +52,19 @@ def test_package_persistent_by_curl(self):
             }
         )
         assert self.hc_api.is_s2i_pod_running(pod_name_prefix="httpd-example")
-        assert self.hc_api.test_helm_curl_output(
-            route_name="httpd-example",
-            expected_str="Welcome to your static httpd application on OpenShift"
+        assert self.hc_api.oc_api.check_response_inside_cluster(
+            name_in_template="httpd-example",
+            expected_output="Welcome to your static httpd application on OpenShift"
         )
 
     def test_package_persistent_by_helm_chart_test(self):
         new_version = VERSION
         if "micro" in VERSION:
             new_version = VERSION.replace("-micro", "")
-        self.hc_api.package_name = "httpd-imagestreams"
+        self.hc_api.package_name = "redhat-httpd-imagestreams"
         self.hc_api.helm_package()
         assert self.hc_api.helm_installation()
-        self.hc_api.package_name = "httpd-template"
+        self.hc_api.package_name = "redhat-httpd-template"
         self.hc_api.helm_package()
         assert self.hc_api.helm_installation(
             values={