diff --git a/src/frontend/src/pages/MainPage/components/components/index.tsx b/src/frontend/src/pages/MainPage/components/components/index.tsx
index 6c48cc80e..130cb9eba 100644
--- a/src/frontend/src/pages/MainPage/components/components/index.tsx
+++ b/src/frontend/src/pages/MainPage/components/components/index.tsx
@@ -159,6 +159,9 @@ export default function ComponentsComponent({
                             variant="outline"
                             size="sm"
                             className="whitespace-nowrap "
+                            data-testid={
+                              "edit-flow-button-" + item.id + "-" + idx
+                            }
                           >
                             <IconComponent
                               name="ExternalLink"
diff --git a/src/frontend/tests/onlyFront/dragAndDrop.spec.ts b/src/frontend/tests/onlyFront/dragAndDrop.spec.ts
index 7f1af0f12..09ed9b669 100644
--- a/src/frontend/tests/onlyFront/dragAndDrop.spec.ts
+++ b/src/frontend/tests/onlyFront/dragAndDrop.spec.ts
@@ -43,9 +43,7 @@ test.describe("drag and drop test", () => {
     );
 
     await page
-      .locator(
-        '//*[@id="root"]/div/div[1]/div[2]/div[3]/div/div/div/div/div/div/div/div[2]/span[2]'
-      )
+      .getByTestId("edit-flow-button-e9ac1bdc-429b-475d-ac03-d26f9a2a3210-0")
       .click();
     await page.waitForTimeout(2000);
 
diff --git a/src/frontend/tests/onlyFront/group.spec.ts b/src/frontend/tests/onlyFront/group.spec.ts
index 8218e767b..f4cbe8458 100644
--- a/src/frontend/tests/onlyFront/group.spec.ts
+++ b/src/frontend/tests/onlyFront/group.spec.ts
@@ -33,7 +33,8 @@ test.describe("group node test", () => {
       return dt;
     }, jsonContent);
 
-    // Now dispatch
+    page.waitForTimeout(2000);
+
     await page.dispatchEvent(
       '//*[@id="root"]/div/div[1]/div[2]/div[3]/div/div',
       "drop",
@@ -43,9 +44,7 @@ test.describe("group node test", () => {
     );
 
     await page
-      .locator(
-        '//*[@id="root"]/div/div[1]/div[2]/div[3]/div/div/div/div/div/div/div/div[2]/span[2]'
-      )
+      .getByTestId("edit-flow-button-e9ac1bdc-429b-475d-ac03-d26f9a2a3210-0")
       .click();
     await page.waitForTimeout(2000);
 
@@ -67,7 +66,6 @@ test.describe("group node test", () => {
     });
 
     await page.getByRole("button", { name: "Group" }).click();
-    await page.locator("div").filter({ hasText: "Star13756" }).nth(3).click();
 
     const textArea = page.getByTestId("div-textarea-2");
     const elementCountText = await textArea.count();
@@ -80,5 +78,7 @@ test.describe("group node test", () => {
     if (elementGroup > 0) {
       expect(true).toBeTruthy();
     }
+
+    // Now dispatch
   });
 });
diff --git a/src/frontend/tests/onlyFront/saveComponents.spec.ts b/src/frontend/tests/onlyFront/saveComponents.spec.ts
index 07a074bad..a123a422e 100644
--- a/src/frontend/tests/onlyFront/saveComponents.spec.ts
+++ b/src/frontend/tests/onlyFront/saveComponents.spec.ts
@@ -51,9 +51,7 @@ test.describe("save component tests", () => {
     );
 
     await page
-      .locator(
-        '//*[@id="root"]/div/div[1]/div[2]/div[3]/div/div/div/div/div/div/div/div[2]/span[2]'
-      )
+      .getByTestId("edit-flow-button-e9ac1bdc-429b-475d-ac03-d26f9a2a3210-0")
       .click();
     await page.waitForTimeout(2000);
 
@@ -75,7 +73,6 @@ test.describe("save component tests", () => {
     });
 
     await page.getByRole("button", { name: "Group" }).click();
-    await page.locator("div").filter({ hasText: "Star13756" }).nth(3).click();
 
     let textArea = page.getByTestId("div-textarea-2");
     let elementCountText = await textArea.count();