diff --git a/src/org/labkey/test/components/ui/grids/GridRow.java b/src/org/labkey/test/components/ui/grids/GridRow.java
index 4e0906efbd..ee920a2767 100644
--- a/src/org/labkey/test/components/ui/grids/GridRow.java
+++ b/src/org/labkey/test/components/ui/grids/GridRow.java
@@ -79,6 +79,11 @@ public GridRow select(boolean checked)
         return this;
     }
 
+    public ReactCheckBox getCheckbox()
+    {
+        return elementCache().selectCheckbox;
+    }
+
     /**
      * gets the cell at the specified index
      */
diff --git a/src/org/labkey/test/components/ui/grids/QueryGrid.java b/src/org/labkey/test/components/ui/grids/QueryGrid.java
index f67124827f..04a477c094 100644
--- a/src/org/labkey/test/components/ui/grids/QueryGrid.java
+++ b/src/org/labkey/test/components/ui/grids/QueryGrid.java
@@ -293,6 +293,11 @@ public boolean hasSelectAllButton()
         return elementCache().selectAllBtnLoc.findWhenNeeded(this).isDisplayed();
     }
 
+    public WebElement getSelectAllButton()
+    {
+        return elementCache().selectAllBtnLoc.findWhenNeeded(this);
+    }
+
     /**
      *  Selects all rows in the target domain, including those on other pages, if there are any
      */
@@ -765,7 +770,7 @@ protected class ElementCache extends ResponsiveGrid<QueryGrid>.ElementCache
 
         final Locator.XPathLocator selectionStatusContainerLoc = Locator.tagWithClass("div", "selection-status");
         final Locator selectAllBtnLoc = selectionStatusContainerLoc.append(Locator.tagWithClass("span", "selection-status__select-all")
-                .child(Locator.buttonContainingText("Select all")));
+                .child(Locator.buttonContainingText("Select")));
         final Locator clearBtnLoc = selectionStatusContainerLoc.append(Locator.byClass("selection-status__clear-all")
                 .child(Locator.tag("button")));