diff --git a/src/org/labkey/test/LabKeySiteWrapper.java b/src/org/labkey/test/LabKeySiteWrapper.java
index ce362e5f3e..7868d81788 100644
--- a/src/org/labkey/test/LabKeySiteWrapper.java
+++ b/src/org/labkey/test/LabKeySiteWrapper.java
@@ -56,6 +56,7 @@
 import org.labkey.test.pages.core.admin.ShowAdminPage;
 import org.labkey.test.pages.user.UserDetailsPage;
 import org.labkey.test.util.APIUserHelper;
+import org.labkey.test.util.ApiPermissionsHelper;
 import org.labkey.test.util.DataRegionTable;
 import org.labkey.test.util.LabKeyExpectedConditions;
 import org.labkey.test.util.LogMethod;
@@ -772,6 +773,9 @@ else if (getDriver().getTitle().startsWith("Sign In"))
                     // Note: leave the self-report setting unchanged
                     customizeSitePage.save();
                 }
+
+                verifySiteGroups();
+
                 /*
                     Waiting for search service to boot up
                     Issue 50601: PDF indexing is slow on first file after server startup on Windows
@@ -786,10 +790,12 @@ else if (getDriver().getTitle().startsWith("Sign In"))
                     waitForElement(Locator.id("status-progress-bar").withText("Module startup complete"), WAIT_FOR_PAGE);
                     clickAndWait(Locator.lkButton("Next"));
                     Locator.lkButton("Next")
-                            .findOptionalElement(getDriver())
-                            .ifPresent(button ->
-                                    doAndWaitForPageToLoad(() ->
-                                            shortWait().until(LabKeyExpectedConditions.clickUntilStale(button))));
+                        .findOptionalElement(getDriver())
+                        .ifPresent(button ->
+                            doAndWaitForPageToLoad(() ->
+                                shortWait().until(LabKeyExpectedConditions.clickUntilStale(button))
+                            )
+                        );
                 }
                 else
                 {
@@ -952,6 +958,23 @@ public boolean isRedirected(HttpRequest httpRequest, HttpResponse httpResponse,
         }
     }
 
+    @LogMethod
+    private void verifySiteGroups()
+    {
+        // Simple verification of the site groups created at bootstrap time, Issue #52166
+        ApiPermissionsHelper helper = new ApiPermissionsHelper(this);
+        // Site groups are returned in known order: alphabetical by name, except that "Users" is replaced with
+        // "All Site Users" after sorting takes place
+        List<Map<String, Object>> siteGroups = helper.getSiteGroups();
+        assertEquals(2, siteGroups.size());
+        Map<String, Object> guests = siteGroups.get(0);
+        assertEquals("Guests", guests.get("name"));
+        assertEquals(-3, guests.get("id"));
+        Map<String, Object> users = siteGroups.get(1);
+        assertEquals("All Site Users", users.get("name"));
+        assertEquals(-2, users.get("id"));
+    }
+
     public static final Pattern ERROR_PATTERN = Pattern.compile("^(ERROR|FATAL)", Pattern.MULTILINE);
 
     public void checkErrors()
diff --git a/src/org/labkey/test/WebTestHelper.java b/src/org/labkey/test/WebTestHelper.java
index 9b8f65fffe..4ecf3bc33a 100644
--- a/src/org/labkey/test/WebTestHelper.java
+++ b/src/org/labkey/test/WebTestHelper.java
@@ -584,13 +584,7 @@ public static Connection getRemoteApiConnection()
 
     public static Connection getRemoteApiConnection(boolean includeCookiesFromPrimaryUser)
     {
-        String username = PasswordUtil.getUsername();
-        Connection connection = new Connection(getBaseURL(), username, PasswordUtil.getPassword());
-
-        if (includeCookiesFromPrimaryUser)
-            addCachedCookies(connection, username);
-
-        return connection;
+        return getRemoteApiConnection(PasswordUtil.getUsername(), includeCookiesFromPrimaryUser);
     }
 
     public static Connection getRemoteApiConnection(String username, boolean includeCookies)
diff --git a/src/org/labkey/test/tests/WebpartPermissionsTest.java b/src/org/labkey/test/tests/WebpartPermissionsTest.java
index 3baf89e681..7bf37cfac4 100644
--- a/src/org/labkey/test/tests/WebpartPermissionsTest.java
+++ b/src/org/labkey/test/tests/WebpartPermissionsTest.java
@@ -74,8 +74,6 @@ private void folderDelete()
             fail("Unable to delete dummy project");
         }
         assertTextNotPresent("Flow Script");
-
-
     }
 
     private void changeWebpartPermAndVerify()
@@ -104,7 +102,6 @@ private void changeWebpartPermToCurrentFolderAndVerify ()
         goToProjectHome();
         assertTextPresent(changedWebPart);
         stopImpersonating();
-
     }
 
     private void verifyCorrectWebpartsVisible()
diff --git a/src/org/labkey/test/util/ApiPermissionsHelper.java b/src/org/labkey/test/util/ApiPermissionsHelper.java
index c44d25ef0a..4353faf07e 100644
--- a/src/org/labkey/test/util/ApiPermissionsHelper.java
+++ b/src/org/labkey/test/util/ApiPermissionsHelper.java
@@ -211,7 +211,7 @@ private List<Map<String, Object>> getProjectGroups(String project)
         return groups;
     }
 
-    private List<Map<String, Object>> getSiteGroups()
+    public List<Map<String, Object>> getSiteGroups()
     {
         return getGroups("/");
     }
@@ -230,9 +230,6 @@ private Integer getProjectGroupId(String groupName, String project)
 
     private Integer getSiteGroupId(String groupName)
     {
-        if ("Developers".equals(groupName))
-            return -4; // Actually a role, exposed as a group -- org.labkey.api.security.Group.groupDevelopers
-
         for (Map<String, Object> group : getSiteGroups())
         {
             if (groupName.equals(group.get("name")))