--- a/browser/components/places/tests/browser/head.js
+++ b/browser/components/places/tests/browser/head.js
@@ -345,17 +345,19 @@ var withBookmarksDialog = Task.async(fun
   }
 });
 
 /**
  * Opens the contextual menu on the element pointed by the given selector.
  *
  * @param selector
  *        Valid selector syntax
- * @return the target DOM node.
+ * @return Promise
+ *         Returns a Promise that resolves once the context menu has been
+ *         opened.
  */
 var openContextMenuForContentSelector = Task.async(function* (browser, selector) {
   info("wait for the context menu");
   let contextPromise = BrowserTestUtils.waitForEvent(document.getElementById("contentAreaContextMenu"),
                                                      "popupshown");
   yield ContentTask.spawn(browser, { selector }, function* (args) {
     let doc = content.document;
     let elt = doc.querySelector(args.selector)
@@ -367,18 +369,16 @@ var openContextMenuForContentSelector = 
              .getInterface(Components.interfaces.nsIDOMWindowUtils);
     let rect = elt.getBoundingClientRect();
     let left = rect.left + rect.width / 2;
     let top = rect.top + rect.height / 2;
     domWindowUtils.sendMouseEvent("contextmenu", left, top, 2,
                                   1, 0, false, 0, 0, true);
   });
   yield contextPromise;
-
-  return gContextMenuContentData.popupNode;
 });
 
 /**
  * Waits for a specified condition to happen.
  *
  * @param conditionFn
  *        a Function or a generator function, returning a boolean for whether
  *        the condition is fulfilled.