diff --git a/web/regression/feature_tests/xss_checks_panels_and_query_tool_test.py b/web/regression/feature_tests/xss_checks_panels_and_query_tool_test.py
index 31d674126..997df9654 100644
--- a/web/regression/feature_tests/xss_checks_panels_and_query_tool_test.py
+++ b/web/regression/feature_tests/xss_checks_panels_and_query_tool_test.py
@@ -157,8 +157,8 @@ class CheckForXssFeatureTest(BaseFeatureTest):
                 self.page.click_tab("Dependents")
                 source_code = \
                     self.page.find_by_css_selector(
-                        "#id-dependents div[role='row']:nth-child(1) "
-                        "div[role='cell']:nth-child(2)"
+                        "#id-dependents div.pgrt-row-content:nth-child(1) "
+                        "div.pgrd-row-cell:nth-child(2)"
                     ).get_attribute('innerHTML')
                 retry = 0
             except WebDriverException as e:
@@ -213,7 +213,7 @@ class CheckForXssFeatureTest(BaseFeatureTest):
         # Check for history entry
         history_ele = self.page\
             .find_by_css_selector(
-                QueryToolLocators.query_history_specific_entry.format(1))
+                QueryToolLocators.query_history_specific_entry.format(2))
 
         source_code = history_ele.get_attribute('innerHTML')
 
diff --git a/web/regression/feature_tests/xss_checks_roles_control_test.py b/web/regression/feature_tests/xss_checks_roles_control_test.py
index d6a5aeca6..c1173b700 100644
--- a/web/regression/feature_tests/xss_checks_roles_control_test.py
+++ b/web/regression/feature_tests/xss_checks_roles_control_test.py
@@ -80,8 +80,8 @@ class CheckRoleMembershipControlFeatureTest(BaseFeatureTest):
 
         # Fetch the source code for our custom control
         source_code = self.page.find_by_xpath(
-            "//div[contains(@role, 'cell')]//span[contains(@class,'icon-')]"
-            "/following-sibling::span"
+            "//div[contains(@class, 'pgrd-row-cell')]"
+            "//span[contains(@class,'icon-')]/following-sibling::span"
         ).get_attribute('innerHTML')
 
         self._check_escaped_characters(