diff --git a/ocs_ci/ocs/exceptions.py b/ocs_ci/ocs/exceptions.py
index 814b6e4474e..8df8c964011 100644
--- a/ocs_ci/ocs/exceptions.py
+++ b/ocs_ci/ocs/exceptions.py
@@ -762,3 +762,7 @@ class ActiveMdsValueNotMatch(Exception):
 
 class DistributionStatusError(Exception):
     pass
+
+
+class InvalidPodPresent(Exception):
+    pass
diff --git a/ocs_ci/ocs/resources/storage_cluster.py b/ocs_ci/ocs/resources/storage_cluster.py
index 8b152f41589..2e875717092 100644
--- a/ocs_ci/ocs/resources/storage_cluster.py
+++ b/ocs_ci/ocs/resources/storage_cluster.py
@@ -26,6 +26,7 @@
 from ocs_ci.ocs import constants, defaults, ocp, managedservice
 from ocs_ci.ocs.exceptions import (
     CommandFailed,
+    InvalidPodPresent,
     ResourceNotFoundError,
     UnsupportedFeatureError,
     PVNotSufficientException,
@@ -35,6 +36,7 @@
 from ocs_ci.ocs.resources import csv, deployment
 from ocs_ci.ocs.resources.ocs import get_ocs_csv
 from ocs_ci.ocs.resources.pod import (
+    get_all_pods,
     get_pods_having_label,
     get_osd_pods,
     get_mon_pods,
@@ -3323,3 +3325,45 @@ def get_deviceset_sc_name_per_deviceclass():
     """
     device_sets = get_all_device_sets()
     return {get_deviceset_sc_name(d): get_deviceclass_name(d) for d in device_sets}
+
+
+def check_unnecessary_pods_present():
+    """
+    Based on configuration, check that pods that are not necessary are not
+    present.
+    """
+    no_noobaa = config.COMPONENTS["disable_noobaa"]
+    no_ceph = (
+        config.DEPLOYMENT["external_mode"] or config.ENV_DATA["mcg_only_deployment"]
+    )
+    pod_names = [
+        pod.name for pod in get_all_pods(namespace=config.ENV_DATA["cluster_namespace"])
+    ]
+    log.info(f"Checking if only required operator pods are available in : {pod_names}")
+    if no_noobaa:
+        for invalid_pod_name in [
+            constants.NOOBAA_OPERATOR_DEPLOYMENT,
+            constants.NOOBAA_ENDPOINT_DEPLOYMENT,
+            constants.NOOBAA_DB_STATEFULSET,
+            constants.NOOBAA_CORE_STATEFULSET,
+        ]:
+            invalid_pods_found = [
+                pod_name
+                for pod_name in pod_names
+                if pod_name.startswith(invalid_pod_name)
+            ]
+            if invalid_pods_found:
+                raise InvalidPodPresent(
+                    f"Pods {invalid_pods_found} should not be present because NooBaa is not available"
+                )
+    if no_ceph:
+        for invalid_pod_name in [constants.ROOK_CEPH_OPERATOR]:
+            invalid_pods_found = [
+                pod_name
+                for pod_name in pod_names
+                if pod_name.startswith(invalid_pod_name)
+            ]
+            if invalid_pods_found:
+                raise InvalidPodPresent(
+                    f"Pods {invalid_pods_found} should not be present because Ceph is not available"
+                )
diff --git a/tests/functional/z_cluster/test_storagesystem.py b/tests/functional/z_cluster/test_storagesystem.py
new file mode 100644
index 00000000000..217fcea140d
--- /dev/null
+++ b/tests/functional/z_cluster/test_storagesystem.py
@@ -0,0 +1,55 @@
+import logging
+
+import pytest
+from ocs_ci.ocs import constants, ocp
+from ocs_ci.ocs.exceptions import CommandFailed
+from ocs_ci.framework import config
+from ocs_ci.framework.testlib import (
+    brown_squad,
+    ManageTest,
+    tier1,
+)
+from ocs_ci.framework.logger_helper import log_step
+
+logger = logging.getLogger(__name__)
+
+
+@brown_squad
+@pytest.mark.polarion_id("")
+class TestStorageSystem(ManageTest):
+    """
+    Verify the ceph full thresholds storagecluster parameters move to cephcluster
+
+    """
+
+    @tier1
+    def test_storagesystem_not_present(self):
+        """
+        1. Storage System is not present
+        2. Storage Cluster owner reference doesn't contain storage system
+
+        """
+
+    log_step("Storage System is not present")
+    storage_system = ocp.OCP(
+        kind=constants.STORAGESYSTEM, namespace=config.ENV_DATA["cluster_namespace"]
+    )
+    try:
+        storage_system_data = storage_system.get()
+    except CommandFailed:
+        pass
+    else:
+        assert False, "Storage System found but it should not be present"
+    log_step("Storage Cluster owner reference doesn't contain storage system")
+    storage_cluster = ocp.OCP(
+        kind=constants.STORAGECLUSTER, namespace=config.ENV_DATA["cluster_namespace"]
+    )
+    storage_cluster_data = storage_system.get()
+    owner_references = storage_cluster_data.get("metadata").get("ownerReferences", {})
+    assert not any(
+        [
+            reference
+            for reference in owner_references
+            if reference["kind"] == "StorageSystem"
+        ]
+    )