--- a/toolkit/components/satchel/test/parent_utils.js
+++ b/toolkit/components/satchel/test/parent_utils.js
@@ -7,20 +7,19 @@ Cu.import("resource://testing-common/Con
 var gAutocompletePopup = Services.ww.activeWindow.
                                    document.
                                    getElementById("PopupAutoComplete");
 assert.ok(gAutocompletePopup, "Got autocomplete popup");
 
 var ParentUtils = {
   getMenuEntries() {
     let entries = [];
-    let column = gAutocompletePopup.tree.columns[0];
-    let numRows = gAutocompletePopup.tree.view.rowCount;
+    let numRows = gAutocompletePopup.view.matchCount;
     for (let i = 0; i < numRows; i++) {
-      entries.push(gAutocompletePopup.tree.view.getCellText(i, column));
+      entries.push(gAutocompletePopup.view.getValueAt(i));
     }
     return entries;
   },
 
   cleanUpFormHist() {
     FormHistory.update({ op: "remove" });
   },
 
@@ -64,21 +63,20 @@ var ParentUtils = {
       }
     };
 
     FormHistory.count(obj, listener);
   },
 
   checkRowCount(expectedCount, expectedFirstValue = null) {
     ContentTaskUtils.waitForCondition(() => {
-      return gAutocompletePopup.tree.view.rowCount === expectedCount &&
+      return gAutocompletePopup.view.matchCount === expectedCount &&
         (!expectedFirstValue ||
           expectedCount <= 1 ||
-          gAutocompletePopup.tree.view.getCellText(0, gAutocompletePopup.tree.columns[0]) ===
-          expectedFirstValue);
+          gAutocompletePopup.view.getValueAt(0) === expectedFirstValue);
     }, "Waiting for row count change: " + expectedCount + " First value: " + expectedFirstValue).then(() => {
       let results = this.getMenuEntries();
       sendAsyncMessage("gotMenuChange", { results });
     });
   },
 
   checkSelectedIndex(expectedIndex) {
     ContentTaskUtils.waitForCondition(() => {