diff --git a/e2e/tests/test_e2e.py b/e2e/tests/test_e2e.py
index 71153411f..daba8d2ae 100644
--- a/e2e/tests/test_e2e.py
+++ b/e2e/tests/test_e2e.py
@@ -38,6 +38,9 @@ class EndToEndTestCase(unittest.TestCase):
         # set a single K8s wrapper for all tests
         k8s = cls.k8s = K8s()
 
+        # remove existing local storage class and create hostpath class
+        k8s.api.storage_v1_api.delete_storage_class("standard")
+
         # operator deploys pod service account there on start up
         # needed for test_multi_namespace_support()
         cls.namespace = "test"
@@ -768,6 +771,7 @@ class K8sApi:
         self.batch_v1_beta1 = client.BatchV1beta1Api()
         self.custom_objects_api = client.CustomObjectsApi()
         self.policy_v1_beta1 = client.PolicyV1beta1Api()
+        self.storage_v1_api = client.StorageV1Api()
 
 
 class K8s:
diff --git a/manifests/e2e-storage-class.yaml b/manifests/e2e-storage-class.yaml
index 9bba049c9..c8d941341 100644
--- a/manifests/e2e-storage-class.yaml
+++ b/manifests/e2e-storage-class.yaml
@@ -2,7 +2,7 @@ apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
   namespace: kube-system
-  name: e2e-standard
+  name: standard
   annotations:
     storageclass.kubernetes.io/is-default-class: "true"
 provisioner: kubernetes.io/host-path
diff --git a/manifests/minimal-postgres-manifest.yaml b/manifests/minimal-postgres-manifest.yaml
index 714f8cd1d..4dd6b7ee4 100644
--- a/manifests/minimal-postgres-manifest.yaml
+++ b/manifests/minimal-postgres-manifest.yaml
@@ -7,7 +7,6 @@ spec:
   teamId: "acid"
   volume:
     size: 1Gi
-    storageClass: e2e-standard
   numberOfInstances: 2
   users:
     zalando:  # database owner