diff --git a/frontend/tests/ldap.spec.ts b/frontend/tests/ldap.spec.ts
index fd023b03..b065248c 100644
--- a/frontend/tests/ldap.spec.ts
+++ b/frontend/tests/ldap.spec.ts
@@ -65,6 +65,8 @@ test.describe('LDAP Integration', () => {
 	test('LDAP users cannot be modified in PocketID', async ({ page }) => {
 		// Navigate to LDAP user details
 		await page.goto('/settings/admin/users');
+		await page.waitForLoadState('networkidle');
+
 		await page.getByRole('row', { name: 'testuser1' }).getByRole('button').click();
 		await page.getByRole('menuitem', { name: 'Edit' }).click();
 
@@ -76,6 +78,8 @@ test.describe('LDAP Integration', () => {
 	test('LDAP groups cannot be modified in PocketID', async ({ page }) => {
 		// Navigate to LDAP group details
 		await page.goto('/settings/admin/user-groups');
+		await page.waitForLoadState('networkidle');
+
 		await page
 			.getByRole('row', { name: 'test_group' })
 			.locator('#bits-10')
diff --git a/frontend/tests/user-group.spec.ts b/frontend/tests/user-group.spec.ts
index 6a60dd56..396038be 100644
--- a/frontend/tests/user-group.spec.ts
+++ b/frontend/tests/user-group.spec.ts
@@ -25,7 +25,7 @@ test('Edit user group', async ({ page }) => {
 	await page.goto('/settings/admin/user-groups');
 	const group = userGroups.developers;
 
-	await page.getByRole('row', { name: group.name }).getByRole('button').click();
+	await page.getByRole('row', { name: group.name }).locator('#bits-5').getByRole('button').click();
 	await page.getByRole('menuitem', { name: 'Edit' }).click();
 
 	await page.getByLabel('Friendly Name').fill('Developers updated');