diff --git a/Services/client/tests/delete-file-grid-view.spec.ts b/Services/client/tests/delete-file-grid-view.spec.ts
index 0f97f12..7aee17d 100644
--- a/Services/client/tests/delete-file-grid-view.spec.ts
+++ b/Services/client/tests/delete-file-grid-view.spec.ts
@@ -28,7 +28,7 @@ test('Login', async ({}) => {
 test('Create Cabinet', async () => {
   await page.click("//div[@id='triggerFolderCreateFileItem']")
   await page.fill("(//input[@placeholder='กรอกชื่อ'])[1]", 'test-delete-file')
-  await page.click("(//span[text()='บันทึก'])[2]")
+  await page.click("//button[@type='submit']")
   await expect(page.locator("(//div[@class='col'])[3]")).toContainText(
     /test-delete-file/,
   )
@@ -44,7 +44,7 @@ test('Go into Cabinet', async () => {
 test('Create Drawer', async () => {
   await page.click("//div[@id='triggerFolderCreateFileItem']")
   await page.fill("(//input[@placeholder='กรอกชื่อ'])[1]", 'test-delete-file')
-  await page.click("(//span[text()='บันทึก'])[2]")
+  await page.click("//button[@type='submit']")
   await expect(page.locator("(//div[@class='col'])[3]")).toContainText(
     /test-delete-file/,
   )
@@ -60,7 +60,7 @@ test('Go into Drawer', async () => {
 test('Create Folder', async () => {
   await page.click("//div[@id='triggerFolderCreateFileItem']")
   await page.fill("(//input[@placeholder='กรอกชื่อ'])[1]", 'test-delete-file')
-  await page.click("(//span[text()='บันทึก'])[2]")
+  await page.click("//button[@type='submit']")
   await expect(page.locator("(//div[@class='col'])[3]")).toContainText(
     /test-delete-file/,
   )
diff --git a/Services/client/tests/upload-file-grid-view.spec.ts b/Services/client/tests/upload-file-grid-view.spec.ts
index cfc800b..1ce4571 100644
--- a/Services/client/tests/upload-file-grid-view.spec.ts
+++ b/Services/client/tests/upload-file-grid-view.spec.ts
@@ -28,7 +28,7 @@ test('Login', async ({}) => {
 test('Create Cabinet', async () => {
   await page.click("//div[@id='triggerFolderCreateFileItem']")
   await page.fill("(//input[@placeholder='กรอกชื่อ'])[1]", 'test-upload-file')
-  await page.click("(//span[text()='บันทึก'])[2]")
+  await page.click("//button[@type='submit']")
   await expect(page.locator("(//div[@class='col'])[3]")).toContainText(
     /test-upload-file/,
   )
@@ -44,7 +44,7 @@ test('Go into Cabinet', async () => {
 test('Create Drawer', async () => {
   await page.click("//div[@id='triggerFolderCreateFileItem']")
   await page.fill("(//input[@placeholder='กรอกชื่อ'])[1]", 'test-upload-file')
-  await page.click("(//span[text()='บันทึก'])[2]")
+  await page.click("//button[@type='submit']")
   await expect(page.locator("(//div[@class='col'])[3]")).toContainText(
     /test-upload-file/,
   )
@@ -60,7 +60,7 @@ test('Go into Drawer', async () => {
 test('Create Folder', async () => {
   await page.click("//div[@id='triggerFolderCreateFileItem']")
   await page.fill("(//input[@placeholder='กรอกชื่อ'])[1]", 'test-upload-file')
-  await page.click("(//span[text()='บันทึก'])[2]")
+  await page.click("//button[@type='submit']")
   await expect(page.locator("(//div[@class='col'])[3]")).toContainText(
     /test-upload-file/,
   )