diff --git a/public/components/Main/__snapshots__/main.test.tsx.snap b/public/components/Main/__snapshots__/main.test.tsx.snap
index ec09cff..a0635e7 100644
--- a/public/components/Main/__snapshots__/main.test.tsx.snap
+++ b/public/components/Main/__snapshots__/main.test.tsx.snap
@@ -971,6 +971,8 @@ exports[`<Main /> spec click run button, and response is not ok 1`] = `
                 >
                   <span
                     class="euiButton__text euiButtonGroupButton__textShift"
+                    data-text="SQL"
+                    title="SQL"
                   >
                     <input
                       checked=""
@@ -995,6 +997,8 @@ exports[`<Main /> spec click run button, and response is not ok 1`] = `
                 >
                   <span
                     class="euiButton__text euiButtonGroupButton__textShift"
+                    data-text="PPL"
+                    title="PPL"
                   >
                     <input
                       class="euiScreenReaderOnly"
@@ -1407,6 +1411,8 @@ exports[`<Main /> spec click run button, and response is ok 1`] = `
                 >
                   <span
                     class="euiButton__text euiButtonGroupButton__textShift"
+                    data-text="SQL"
+                    title="SQL"
                   >
                     <input
                       checked=""
@@ -1431,6 +1437,8 @@ exports[`<Main /> spec click run button, and response is ok 1`] = `
                 >
                   <span
                     class="euiButton__text euiButtonGroupButton__textShift"
+                    data-text="PPL"
+                    title="PPL"
                   >
                     <input
                       class="euiScreenReaderOnly"
@@ -1843,6 +1851,8 @@ exports[`<Main /> spec click run button, response fills null and missing values
                 >
                   <span
                     class="euiButton__text euiButtonGroupButton__textShift"
+                    data-text="SQL"
+                    title="SQL"
                   >
                     <input
                       checked=""
@@ -1867,6 +1877,8 @@ exports[`<Main /> spec click run button, response fills null and missing values
                 >
                   <span
                     class="euiButton__text euiButtonGroupButton__textShift"
+                    data-text="PPL"
+                    title="PPL"
                   >
                     <input
                       class="euiScreenReaderOnly"
diff --git a/public/components/Main/main.test.tsx b/public/components/Main/main.test.tsx
index bc515b5..48f826d 100644
--- a/public/components/Main/main.test.tsx
+++ b/public/components/Main/main.test.tsx
@@ -16,7 +16,7 @@ import {
   mockOpenSearchTreeQuery,
   mockQueryResultJDBCResponse,
   mockQueryTranslationResponse,
-  mockResultWithNull
+  mockResultWithNull,
 } from '../../../test/mocks/mockData';
 import { Main } from './main';
 
@@ -89,8 +89,7 @@ describe('<Main /> spec', () => {
     });
     expect(document.body.children[0]).toMatchSnapshot();
   });
-  
-  
+
   it('renders the component and checks if side tree is loaded', async () => {
     const client = httpClientMock;
     client.post = jest.fn().mockResolvedValue(mockHttpQuery);
@@ -115,13 +114,14 @@ describe('<Main /> spec', () => {
     client.get = jest.fn().mockResolvedValue(mockDatasourcesQuery);
     client.post = jest.fn().mockResolvedValue(mockQueryResultJDBCResponse);
 
-    const { getByText, getByTestId } = await render(
+    const { getByText } = await render(
       <Main httpClient={client} setBreadcrumbs={setBreadcrumbsMock} />
     );
     const onRunButton = getByText('Run');
-    const pplbutton =getByTestId('PPL');
+    const sqlbutton = getByText('SQL');
     waitFor(() => {
-     expect(pplbutton).toBeInTheDocument();
+      expect(sqlbutton).toBeInTheDocument();
+      fireEvent.click(sqlbutton);
     });
     const asyncTest = () => {
       fireEvent.click(onRunButton);
@@ -135,12 +135,13 @@ describe('<Main /> spec', () => {
     client.post = jest.fn().mockResolvedValue(mockResultWithNull);
     client.get = jest.fn().mockResolvedValue(mockDatasourcesQuery);
 
-    const { getByText ,getByTestId } = await render(
+    const { getByText } = await render(
       <Main httpClient={client} setBreadcrumbs={setBreadcrumbsMock} />
     );
-    const pplbutton = getByTestId('PPL');
+    const sqlbutton = getByText('SQL');
     waitFor(() => {
-     expect(pplbutton).toBeInTheDocument();
+      expect(sqlbutton).toBeInTheDocument();
+      fireEvent.click(sqlbutton);
     });
     const onRunButton = getByText('Run');
     const asyncTest = () => {
@@ -179,12 +180,13 @@ describe('<Main /> spec', () => {
     });
     client.get = jest.fn().mockResolvedValue(mockDatasourcesQuery);
 
-    const { getByText, getByTestId } = await render(
+    const { getByText } = await render(
       <Main httpClient={client} setBreadcrumbs={setBreadcrumbsMock} />
     );
-    const pplbutton = getByTestId("PPL");
+    const sqlbutton = getByText('SQL');
     waitFor(() => {
-     expect(pplbutton).toBeInTheDocument();
+      expect(sqlbutton).toBeInTheDocument();
+      fireEvent.click(sqlbutton);
     });
     const onRunButton = getByText('Run');
     const asyncTest = () => {
@@ -206,12 +208,13 @@ describe('<Main /> spec', () => {
       }
     });
 
-    const { getByText,getByTestId } = await render(
+    const { getByText } = await render(
       <Main httpClient={client} setBreadcrumbs={setBreadcrumbsMock} />
     );
-    const pplbutton = getByTestId("PPL");
+    const sqlbutton = getByText('SQL');
     waitFor(() => {
-     expect(pplbutton).toBeInTheDocument();
+      expect(sqlbutton).toBeInTheDocument();
+      fireEvent.click(sqlbutton);
     });
     const onTranslateButton = getByText('Explain');
     const asyncTest = () => {
@@ -238,4 +241,4 @@ describe('<Main /> spec', () => {
     await asyncTest();
     expect(document.body.children[0]).toMatchSnapshot();
   });
-});
\ No newline at end of file
+});
diff --git a/release-notes/opensearch-query-workbench.release-notes-2.15.0.0.md b/release-notes/opensearch-query-workbench.release-notes-2.15.0.0.md
index c728de3..13adbe8 100644
--- a/release-notes/opensearch-query-workbench.release-notes-2.15.0.0.md
+++ b/release-notes/opensearch-query-workbench.release-notes-2.15.0.0.md
@@ -5,7 +5,7 @@ Compatible with OpenSearch and OpenSearch Dashboards 2.15.0
 ### Bug Fixes
 
 - added fix for runAsync query without mds id ([#323](https://github.com/opensearch-project/dashboards-query-workbench/pull/323))
-
+- Flakey unit tests fix ([#339](https://github.com/opensearch-project/dashboards-query-workbench/pull/339)) 
 
 ### Maintenance