diff --git a/src/org/labkey/test/components/ui/grids/QueryGrid.java b/src/org/labkey/test/components/ui/grids/QueryGrid.java
index 8ef14d5955..88c20d32cc 100644
--- a/src/org/labkey/test/components/ui/grids/QueryGrid.java
+++ b/src/org/labkey/test/components/ui/grids/QueryGrid.java
@@ -815,7 +815,7 @@ public List<FilterStatusValue> getFilterStatusFilterValues()
             return new FilterStatusValue.FilterStatusValueFinder(getDriver()).findAll(filterStatusPanel);
         }
 
-        final WebElement removeAllFilters = Locator.tagWithClass("a", "remove-all-filters").refindWhenNeeded(this);
+        final WebElement removeAllFilters = Locator.byClass("remove-all-filters").refindWhenNeeded(this);
 
         // The panel header element which will contain the edit status text, the view name and the Save & Undo buttons.
         // If this is the default view this will not be present.
diff --git a/src/org/labkey/test/pages/core/login/CompactFileUploadField.java b/src/org/labkey/test/pages/core/login/CompactFileUploadField.java
index f924ec488b..de25968e91 100644
--- a/src/org/labkey/test/pages/core/login/CompactFileUploadField.java
+++ b/src/org/labkey/test/pages/core/login/CompactFileUploadField.java
@@ -101,7 +101,7 @@ protected class ElementCache extends Component<?>.ElementCache
         WebElement logoFileInput = Locator.tagWithClass("input", "file-upload__input")
                 .refindWhenNeeded(this).withTimeout(4000);
 
-        WebElement removeBtn = Locator.tagWithClass("span", "attached-file__remove-icon")
+        WebElement removeBtn = Locator.tagWithClass("button", "attached-file__remove-icon")
                 .refindWhenNeeded(this).withTimeout(4000);
 
         Locator attachedFile(File file)