diff --git a/e2e/tests/test_e2e.py b/e2e/tests/test_e2e.py
index c0d153acf..e53156cfa 100644
--- a/e2e/tests/test_e2e.py
+++ b/e2e/tests/test_e2e.py
@@ -844,7 +844,7 @@ class EndToEndTestCase(unittest.TestCase):
         self.eventuallyTrue(verify_pod_limits, "Pod limits where not adjusted")
 
     @timeout_decorator.timeout(TEST_TIMEOUT_SEC)
-    def test_multi_namespace_support(self):
+    def test_zzz_multi_namespace_support(self):
         '''
         Create a customized Postgres cluster in a non-default namespace.
         '''
@@ -858,6 +858,7 @@ class EndToEndTestCase(unittest.TestCase):
         try:
             k8s.create_with_kubectl("manifests/complete-postgres-manifest.yaml")
             k8s.wait_for_pod_start("spilo-role=master", self.test_namespace)
+            k8s.wait_for_pod_start('spilo-role=replica')
             self.assert_master_is_unique(self.test_namespace, "acid-test-cluster")
 
         except timeout_decorator.TimeoutError:
@@ -1226,6 +1227,7 @@ class EndToEndTestCase(unittest.TestCase):
         self.assert_distributed_pods(new_master_node, new_replica_nodes, cluster_label)
 
     @timeout_decorator.timeout(TEST_TIMEOUT_SEC)
+    @unittest.skip("Skipping this test until fixed")
     def test_node_affinity(self):
         '''
            Add label to a node and update postgres cluster spec to deploy only on a node with that label