diff --git a/src/org/labkey/test/components/labkey/PortalTab.java b/src/org/labkey/test/components/labkey/PortalTab.java
index 50ec8fd682..ef5a78760f 100644
--- a/src/org/labkey/test/components/labkey/PortalTab.java
+++ b/src/org/labkey/test/components/labkey/PortalTab.java
@@ -222,7 +222,7 @@ static public Locator.XPathLocator tabIdLoc(String tabText)
         }
 
         static public Locator.XPathLocator container = Locator.tagWithClass("ul", "lk-nav-tabs");
-        static public Locator.XPathLocator tabItem = Locator.xpath("//li");
+        static public Locator.XPathLocator tabItem = Locator.xpath("/li");
         static public Locator.XPathLocator subContainerTabSelect = Locator.tagWithAttribute("select", "title", "subContainerTabs");
 
         static public Locator.XPathLocator tabList = container.append(tabItem);
diff --git a/src/org/labkey/test/util/PortalHelper.java b/src/org/labkey/test/util/PortalHelper.java
index e974dcb346..43bb628f0e 100644
--- a/src/org/labkey/test/util/PortalHelper.java
+++ b/src/org/labkey/test/util/PortalHelper.java
@@ -87,7 +87,7 @@ public void moveTab(@LoggedParam String tabText, @LoggedParam Direction directio
             throw new IllegalArgumentException("Can't move folder tabs vertically.");
 
         String tabId = tabText.replace(" ", "") + "Tab";
-        Locator.XPathLocator tabList = Locator.xpath("//ul[contains(@class, 'lk-nav-tabs-admin')]//li[@role='presentation']");
+        Locator.XPathLocator tabList = Locator.xpath("//ul[contains(@class, 'lk-nav-tabs-admin')]/li");
         Locator.XPathLocator tabLink = Locator.xpath("//a[@id=" + Locator.xq(tabId) + "]");
 
         int tabCount = getElementCount(tabList) - 1;