diff --git a/e2e/tests/k8s_api.py b/e2e/tests/k8s_api.py
index eb79d14ce..1f481120e 100644
--- a/e2e/tests/k8s_api.py
+++ b/e2e/tests/k8s_api.py
@@ -101,7 +101,7 @@ class K8s:
         for svc in svcs:
             for key, value in annotations.items():
                 if not svc.metadata.annotations or key not in svc.metadata.annotations or svc.metadata.annotations[key] != value:
-                    print("Expected key {} not found in annotations {}".format(key, svc.metadata.annotation))
+                    print("Expected key {} not found in annotations {}".format(key, svc.metadata.annotations))
                     return False
         return True
 
diff --git a/e2e/tests/test_e2e.py b/e2e/tests/test_e2e.py
index 02f7a0ac3..dbe513631 100644
--- a/e2e/tests/test_e2e.py
+++ b/e2e/tests/test_e2e.py
@@ -614,7 +614,7 @@ class EndToEndTestCase(unittest.TestCase):
             "spec": {
                 "serviceAnnotations": {
                     "annotation.key": "value",
-                    "foo": "bar",
+                    "alice": "bob",
                 }
             }
         }
@@ -624,6 +624,7 @@ class EndToEndTestCase(unittest.TestCase):
         annotations = {
             "annotation.key": "value",
             "foo": "bar",
+            "alice": "bob"
         }
 
         self.eventuallyTrue(lambda: k8s.check_service_annotations("cluster-name=acid-minimal-cluster,spilo-role=master", annotations), "Wrong annotations")
@@ -721,7 +722,7 @@ class EndToEndTestCase(unittest.TestCase):
             raise
 
     @timeout_decorator.timeout(TEST_TIMEOUT_SEC)
-    def test_x_cluster_deletion(self):
+    def test_zzzz_cluster_deletion(self):
         '''
            Test deletion with configured protection
         '''
@@ -774,17 +775,14 @@ class EndToEndTestCase(unittest.TestCase):
             k8s.api.custom_objects_api.delete_namespaced_custom_object(
                 "acid.zalan.do", "v1", "default", "postgresqls", "acid-minimal-cluster")
 
-            # wait until cluster is deleted
-            time.sleep(120)
-
             # check if everything has been deleted
-            self.assertEqual(0, k8s.count_pods_with_label(cluster_label))
-            self.assertEqual(0, k8s.count_services_with_label(cluster_label))
-            self.assertEqual(0, k8s.count_endpoints_with_label(cluster_label))
-            self.assertEqual(0, k8s.count_statefulsets_with_label(cluster_label))
-            self.assertEqual(0, k8s.count_deployments_with_label(cluster_label))
-            self.assertEqual(0, k8s.count_pdbs_with_label(cluster_label))
-            self.assertEqual(0, k8s.count_secrets_with_label(cluster_label))
+            self.eventuallyEqual(lambda: k8s.count_pods_with_label(cluster_label), 0, "Pods not deleted")
+            self.eventuallyEqual(lambda: k8s.count_services_with_label(cluster_label), 0, "Service not deleted")
+            self.eventuallyEqual(lambda: k8s.count_endpoints_with_label(cluster_label), 0, "Endpoints not deleted")
+            self.eventuallyEqual(lambda: k8s.count_statefulsets_with_label(cluster_label), 0, "Statefulset not deleted")
+            self.eventuallyEqual(lambda: k8s.count_deployments_with_label(cluster_label), 0, "Deployments not deleted")
+            self.eventuallyEqual(lambda: k8s.count_pdbs_with_label(cluster_label), 0, "Pod disruption budget not deleted")
+            self.eventuallyEqual(lambda: k8s.count_secrets_with_label(cluster_label), 0, "Secrets not deleted")
 
         except timeout_decorator.TimeoutError:
             print('Operator log: {}'.format(k8s.get_operator_log()))