diff --git a/tests/gui_e2e/customize_rules.json b/tests/gui_e2e/customize_rules.json
index 7e061f451cf..9dcdaea0bc9 100644
--- a/tests/gui_e2e/customize_rules.json
+++ b/tests/gui_e2e/customize_rules.json
@@ -31,9 +31,9 @@
     ],
     "Recurring downtimes for hosts": [
         {
-            "locator": "[name='ve_p_comment']",
+            "locator": "input[name*='_p_comment']",
             "action": "fill",
             "value": "test"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/tests/gui_e2e/test_email_notifications.py b/tests/gui_e2e/test_email_notifications.py
index b158671ed28..2eb6303defb 100644
--- a/tests/gui_e2e/test_email_notifications.py
+++ b/tests/gui_e2e/test_email_notifications.py
@@ -30,7 +30,6 @@ def _notification_user(test_site: Site) -> Iterator[tuple[str, str]]:
     yield from create_notification_user(test_site)
 
 
-@pytest.mark.skip(reason="Ongoing investigation - CMK-21202")
 def test_filesystem_email_notifications(
     dashboard_page: Dashboard,
     linux_hosts: list[str],
diff --git a/tests/gui_e2e/test_rules.py b/tests/gui_e2e/test_rules.py
index 25ba4519587..28e00b64847 100644
--- a/tests/gui_e2e/test_rules.py
+++ b/tests/gui_e2e/test_rules.py
@@ -117,7 +117,7 @@ def _create_rules(pw: Dashboard) -> dict[str, list[str]]:
     return created_rules
 
 
-@pytest.mark.skip(reason="Ongoing investigation - CMK-21202")
+@pytest.mark.skip(reason="Ongoing investigation - CMK-21219")
 def test_create_rules(
     test_site: Site, dashboard_page: Dashboard, pytestconfig: pytest.Config
 ) -> None:
diff --git a/tests/testlib/playwright/pom/setup/add_rule_filesystems.py b/tests/testlib/playwright/pom/setup/add_rule_filesystems.py
index 1d55b81ba66..b78dadc9d39 100644
--- a/tests/testlib/playwright/pom/setup/add_rule_filesystems.py
+++ b/tests/testlib/playwright/pom/setup/add_rule_filesystems.py
@@ -62,7 +62,7 @@ def _levels_for_used_free_space_checkbox(self) -> Locator:
     @property
     def levels_for_used_free_space_warning_text_field(self) -> Locator:
         return self._value_section("Levels for used/free space").locator(
-            "input[name='ve_p_levels_0_0_0']"
+            "input[name*='_p_levels_0_0_0']"
         )
 
     def check_levels_for_user_free_space(self, check: bool) -> None: