diff --git a/resources/js/features/achievements/components/AchievementGroup/AchievementGroup.test.tsx b/resources/js/features/achievements/components/AchievementGroup/AchievementGroup.test.tsx
index df104cb0f0..fb97989e5e 100644
--- a/resources/js/features/achievements/components/AchievementGroup/AchievementGroup.test.tsx
+++ b/resources/js/features/achievements/components/AchievementGroup/AchievementGroup.test.tsx
@@ -68,12 +68,14 @@ describe('Component: AchievementGroup', () => {
     render(<AchievementGroup group={group} showGame={true} />);
 
     // ASSERT
-    expect(screen.getByText(/First Achievement/)).toBeVisible();
-    expect(screen.getByText(/First Game/)).toBeVisible();
+    expect(screen.getAllByText(/First Achievement/)[0]).toBeVisible();
+    expect(screen.getAllByText(/First Game/)[0]).toBeVisible();
     expect(screen.getByText(/Do the first thing/)).toBeVisible();
-    expect(screen.getByText(/Second Achievement/)).toBeVisible();
+
+    expect(screen.getAllByText(/Second Achievement/)[0]).toBeVisible();
     expect(screen.getByText(/Do the second thing/)).toBeVisible();
-    expect(screen.getByText(/Third Achievement/)).toBeVisible();
+
+    expect(screen.getAllByText(/Third Achievement/)[0]).toBeVisible();
     expect(screen.getByText(/Do the third thing/)).toBeVisible();
   });
 });
diff --git a/resources/js/features/achievements/components/UnlockableAchievementAvatar/UnlockableAchievementAvatar.test.tsx b/resources/js/features/achievements/components/UnlockableAchievementAvatar/UnlockableAchievementAvatar.test.tsx
index 3f30ddaf47..2d21a739e6 100644
--- a/resources/js/features/achievements/components/UnlockableAchievementAvatar/UnlockableAchievementAvatar.test.tsx
+++ b/resources/js/features/achievements/components/UnlockableAchievementAvatar/UnlockableAchievementAvatar.test.tsx
@@ -106,8 +106,8 @@ describe('Component: UnlockableAchievementAvatar', () => {
     expect(img).toBeVisible();
     expect(img.src).toContain(achievement.badgeLockedUrl);
 
-    expect(screen.getByText(/Creative Name/)).toBeVisible();
-    expect(screen.getByText(/Container Set/)).toBeVisible();
+    expect(screen.getAllByText(/Creative Name/)[0]).toBeVisible();
+    expect(screen.getAllByText(/Container Set/)[0]).toBeVisible();
     expect(screen.getByText(/Do the thing/)).toBeVisible();
     expect(screen.queryByText(/unlocked/i)).toBeNull();
   });