--- a/testing/marionette/harness/marionette/tests/unit/test_element_retrieval.py
+++ b/testing/marionette/harness/marionette/tests/unit/test_element_retrieval.py
@@ -142,30 +142,30 @@ class TestFindElementHTML(MarionetteTest
         self.assertRaises(NoSuchElementException, self.marionette.find_element, By.CSS_SELECTOR, "cheese")
         self.assertRaises(NoSuchElementException, self.marionette.find_element, By.ID, "cheese")
         self.assertRaises(NoSuchElementException, self.marionette.find_element, By.LINK_TEXT, "cheese")
         self.assertRaises(NoSuchElementException, self.marionette.find_element, By.NAME, "cheese")
         self.assertRaises(NoSuchElementException, self.marionette.find_element, By.PARTIAL_LINK_TEXT, "cheese")
         self.assertRaises(NoSuchElementException, self.marionette.find_element, By.TAG_NAME, "cheese")
         self.assertRaises(NoSuchElementException, self.marionette.find_element, By.XPATH, "cheese")
 
-    def test_not_found(self):
+    def test_not_found_from_element(self):
         self.marionette.set_search_timeout(0)
         self.marionette.navigate(id_html)
         el = self.marionette.find_element(By.ID, "foo")
         self.assertRaises(NoSuchElementException, el.find_element, By.CLASS_NAME, "cheese")
         self.assertRaises(NoSuchElementException, el.find_element, By.CSS_SELECTOR, "cheese")
         self.assertRaises(NoSuchElementException, el.find_element, By.ID, "cheese")
         self.assertRaises(NoSuchElementException, el.find_element, By.LINK_TEXT, "cheese")
         self.assertRaises(NoSuchElementException, el.find_element, By.NAME, "cheese")
         self.assertRaises(NoSuchElementException, el.find_element, By.PARTIAL_LINK_TEXT, "cheese")
         self.assertRaises(NoSuchElementException, el.find_element, By.TAG_NAME, "cheese")
         self.assertRaises(NoSuchElementException, el.find_element, By.XPATH, "cheese")
 
-    def test_not_found_implicit_wait(self):
+    def test_not_found_implicit_wait_from_element(self):
         self.marionette.set_search_timeout(50)
         self.marionette.navigate(id_html)
         el = self.marionette.find_element(By.ID, "foo")
         self.assertRaises(NoSuchElementException, el.find_element, By.CLASS_NAME, "cheese")
         self.assertRaises(NoSuchElementException, el.find_element, By.CSS_SELECTOR, "cheese")
         self.assertRaises(NoSuchElementException, el.find_element, By.ID, "cheese")
         self.assertRaises(NoSuchElementException, el.find_element, By.LINK_TEXT, "cheese")
         self.assertRaises(NoSuchElementException, el.find_element, By.NAME, "cheese")