diff --git a/py/test/selenium/webdriver/common/driver_element_finding_tests.py b/py/test/selenium/webdriver/common/driver_element_finding_tests.py
index 205edb92e1f88..d8209e14aea29 100644
--- a/py/test/selenium/webdriver/common/driver_element_finding_tests.py
+++ b/py/test/selenium/webdriver/common/driver_element_finding_tests.py
@@ -354,7 +354,7 @@ def test_should_be_able_to_identify_elements_by_class(driver, pages):
 
 def test_should_be_able_to_find_an_element_by_xpath_with_multiple_attributes(driver, pages):
     pages.load("formPage.html")
-    element = driver.find_element(By.XPATH, "//form[@name='optional']/input[@type='submit' and @value='Click!']")
+    element = driver.find_element(By.XPATH, "//input[@type='submit' and @value='Click!']")
     assert element.tag_name.lower() == "input"
     assert element.get_attribute("value") == "Click!"
 
diff --git a/py/test/selenium/webdriver/common/webdriverwait_tests.py b/py/test/selenium/webdriver/common/webdriverwait_tests.py
index f332933e4241c..206e0fb64d916 100644
--- a/py/test/selenium/webdriver/common/webdriverwait_tests.py
+++ b/py/test/selenium/webdriver/common/webdriverwait_tests.py
@@ -101,6 +101,7 @@ def test_should_fail_to_find_visible_elements_when_explicit_waiting(driver, page
         WebDriverWait(driver, 0.7).until(EC.visibility_of_any_elements_located((By.CLASS_NAME, "redbox")))
 
 
+@pytest.mark.xfail_firefox
 def test_should_wait_until_all_visible_elements_are_found_when_searching_for_many(driver, pages):
     pages.load("hidden_partially.html")
     add_visible = driver.find_element(By.ID, "addVisible")