diff --git a/tcp_tests/tests/system/test_mcp_update.py b/tcp_tests/tests/system/test_mcp_update.py
index eb64fb2..d1b30ea 100644
--- a/tcp_tests/tests/system/test_mcp_update.py
+++ b/tcp_tests/tests/system/test_mcp_update.py
@@ -96,13 +96,18 @@
 
 
 @pytest.fixture
-def wa_for_sphinx_prod34406(reclass_actions, salt_actions):
+def wa_for_galera_clustercheck_password_prod35705(reclass_actions,
+                                                  salt_actions):
     reclass_actions.add_key(
-        "parameters._param.sphinx_proxy_password_generated",
+        "parameters._param.galera_clustercheck_password",
         "a"*32,
         "cluster/*/infra/secrets.yml")
-    salt_actions.run_state("I@nginx:server",
-                           "saltutil.refresh_pillar")
+    salt_actions.run_state(
+        "I@galera:master or I@galera:slave", "saltutil.refresh_pillar")
+    salt_actions.enforce_state(
+        "I@galera:master or I@galera:slave", "galera")
+    salt_actions.enforce_state(
+        "I@galera:master or I@galera:slave", "haproxy")
 
 
 @pytest.fixture(scope='class')
@@ -120,7 +125,7 @@
 
 
 @pytest.mark.usefixtures("switch_to_proposed_pipelines",
-                         "wa_for_sphinx_prod34406")
+                         "wa_for_galera_clustercheck_password_prod35705")
 class TestUpdateMcpCluster(object):
     """
     Following the steps in