diff --git a/src/org/labkey/test/tests/UserPermissionsTest.java b/src/org/labkey/test/tests/UserPermissionsTest.java
index 066ffe57da..64428d84ee 100644
--- a/src/org/labkey/test/tests/UserPermissionsTest.java
+++ b/src/org/labkey/test/tests/UserPermissionsTest.java
@@ -272,7 +272,7 @@ public void testAuditLogForGroupUpdates()
 
         log("Remove user from group and verify logs");
         goToProjectHome();
-        permissionsHelper.removeUserFromGroup(GAMMA_SUBMITTER_GROUP_NAME, GAMMA_SUBMITTER_USER);
+        permissionsHelper.removeUserFromGroup(GAMMA_SUBMITTER_GROUP_NAME, GAMMA_SUBMITTER_USER, getProjectName());
         verifyAuditLog("User: " + GAMMA_SUBMITTER_USER + " was deleted from Group: " + GAMMA_SUBMITTER_GROUP_NAME);
     }
 
diff --git a/src/org/labkey/test/tests/list/ListTest.java b/src/org/labkey/test/tests/list/ListTest.java
index 99a2a38852..1a56ca7171 100644
--- a/src/org/labkey/test/tests/list/ListTest.java
+++ b/src/org/labkey/test/tests/list/ListTest.java
@@ -907,7 +907,7 @@ public void testAuditDetailRejectsRowIdFromOtherList() throws Exception
             .setText(NAME_FIELD + "\n" + LIST_Y_ROW_VALUE)
             .submit();
         DataRegionTable yTable = new DataRegionTable("query", getDriver());
-        yTable.clickEditRow(yTable.getRowIndex(LIST_Y_ROW_VALUE));
+        yTable.clickEditRow(yTable.getRowIndex(NAME_FIELD, LIST_Y_ROW_VALUE));
         setFormElement(Locator.name("quf_" + NAME_FIELD), LIST_Y_ROW_EDITED);
         clickButton("Submit");
 
@@ -938,13 +938,13 @@ public void testAuditDetailRejectsRowIdFromOtherList() throws Exception
 
     private int lookupListId(Connection cn, String listName) throws Exception
     {
-        SelectRowsCommand cmd = new SelectRowsCommand("exp", "Lists");
-        cmd.setColumns(List.of("RowId", "Name"));
+        SelectRowsCommand cmd = new SelectRowsCommand("ListManager", "ListManager");
+        cmd.setColumns(List.of("ListId", "Name"));
         cmd.addFilter(new Filter("Name", listName, Filter.Operator.EQUAL));
         SelectRowsResponse rs = cmd.execute(cn, getProjectName());
         if (rs.getRows().isEmpty())
-            throw new AssertionError("No exp.Lists row for " + listName);
-        return ((Number) rs.getRows().get(0).get("RowId")).intValue();
+            throw new AssertionError("No ListManager row for " + listName);
+        return ((Number) rs.getRows().get(0).get("ListId")).intValue();
     }
 
     private int lookupListAuditRowId(Connection cn, String listName) throws Exception
diff --git a/src/org/labkey/test/util/ApiPermissionsHelper.java b/src/org/labkey/test/util/ApiPermissionsHelper.java
index ff94975a67..65f36b4b0e 100644
--- a/src/org/labkey/test/util/ApiPermissionsHelper.java
+++ b/src/org/labkey/test/util/ApiPermissionsHelper.java
@@ -672,12 +672,12 @@ private List<String> getGroupNames(String project)
     }
 
     @Override
-    public void removeUserFromGroup(String groupName, String userName)
+    public void removeUserFromGroup(String groupName, String userName, String projectPath)
     {
         Integer groupId = getGroupId(groupName);
         if (groupId == null)
             throw new IllegalArgumentException("Attempting to remove members from non-existent site group: " + groupName);
-        removeMembersFromGroup(groupId, userName);
+        removeMembersFromGroup(groupId, projectPath, userName);
     }
 
     @Override
@@ -686,10 +686,10 @@ public void removeUserFromSiteGroup(String groupName, String userName)
         Integer groupId = getSiteGroupId(groupName);
         if (groupId == null)
             throw new IllegalArgumentException("Attempting to remove members from non-existent group: " + groupName);
-        removeMembersFromGroup(groupId, userName);
+        removeMembersFromGroup(groupId, "/", userName);
     }
 
-    private void removeMembersFromGroup(Integer groupId, String... members)
+    private void removeMembersFromGroup(Integer groupId, String projectPath, String... members)
     {
         BulkUpdateGroupCommand command = new BulkUpdateGroupCommand(groupId);
         command.setCreateGroup(false);
@@ -699,7 +699,7 @@ private void removeMembersFromGroup(Integer groupId, String... members)
         try
         {
             Connection connection = getConnection();
-            command.execute(connection, "/");
+            command.execute(connection, projectPath);
         }
         catch (IOException | CommandException e)
         {
diff --git a/src/org/labkey/test/util/PermissionsHelper.java b/src/org/labkey/test/util/PermissionsHelper.java
index e6ee8338b9..e3bbd600cf 100644
--- a/src/org/labkey/test/util/PermissionsHelper.java
+++ b/src/org/labkey/test/util/PermissionsHelper.java
@@ -175,7 +175,7 @@ public void deleteGroup(String groupName)
     @LogMethod(quiet = true)
     public abstract void deleteGroup(@LoggedParam String groupName, boolean failIfNotFound);
 
-    public abstract void removeUserFromGroup(String groupName, String userName);
+    public abstract void removeUserFromGroup(String groupName, String userName, String projectName);
     public abstract void removeUserFromSiteGroup(String groupName, String userName);
 
     public abstract boolean doesGroupExist(String groupName, String projectName);
diff --git a/src/org/labkey/test/util/UIPermissionsHelper.java b/src/org/labkey/test/util/UIPermissionsHelper.java
index 218c0ba9d0..bf0493eb40 100644
--- a/src/org/labkey/test/util/UIPermissionsHelper.java
+++ b/src/org/labkey/test/util/UIPermissionsHelper.java
@@ -316,11 +316,11 @@ public void deleteGroup(@LoggedParam String groupName, boolean failIfNotFound)
     @Override
     public void removeUserFromSiteGroup(String groupName, String userEmail)
     {
-        removeUserFromGroup(groupName, userEmail);
+        removeUserFromGroup(groupName, userEmail, "/");
     }
 
     @Override
-    public void removeUserFromGroup(String groupName, String userEmail)
+    public void removeUserFromGroup(String groupName, String userEmail, String projectPath)
     {
         if (!_driver.isTextPresent("Group " + groupName))
             selectGroup(groupName);