diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Flow/CustomizeWidgets.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Flow/CustomizeWidgets.spec.ts
index db64bee8bdc8..e7291ad1d787 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Flow/CustomizeWidgets.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Flow/CustomizeWidgets.spec.ts
@@ -34,6 +34,7 @@ import {
   addKpi,
   deleteKpiRequest,
   deleteSeededKpisOnChart,
+  openDataInsightTab,
 } from '../../utils/dataInsight';
 import { waitForAllLoadersToDisappear } from '../../utils/entity';
 import { sidebarClick } from '../../utils/sidebar';
@@ -313,7 +314,7 @@ test('KPI Widget', async ({ page, persona, kpiIds }) => {
     await waitForAllLoadersToDisappear(page);
 
     await sidebarClick(page, SidebarItem.DATA_INSIGHT);
-    await page.getByRole('link', { name: 'KPIs', exact: true }).click();
+    await openDataInsightTab(page, 'kpi');
 
     await page.getByTestId('add-kpi-btn').click();
     const createdKpi = await addKpi(page, {
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/DataInsight.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/DataInsight.spec.ts
index 1ad76af496b5..8621029ca4b5 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/DataInsight.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/DataInsight.spec.ts
@@ -18,7 +18,11 @@ import { expect, test } from '../../support/fixtures/isolatedUser';
 import { okJson } from '../../utils/apiResponse';
 import { createNewPage, redirectToHomePage, uuid } from '../../utils/common';
 import { waitForLandingPageWidget } from '../../utils/customizeLandingPage';
-import { addKpi, deleteKpiRequest } from '../../utils/dataInsight';
+import {
+  addKpi,
+  deleteKpiRequest,
+  openDataInsightTab,
+} from '../../utils/dataInsight';
 import { waitForResponseWithStatus } from '../../utils/waitHelpers';
 
 // use the admin user to login
@@ -95,7 +99,7 @@ test.describe('Data Insight Page', { tag: '@data-insight' }, () => {
   test('Create description and owner KPI', async ({ page }) => {
     await navigateToDataInsightPage(page);
 
-    await page.getByRole('link', { name: 'KPIs', exact: true }).click();
+    await openDataInsightTab(page, 'kpi');
 
     for (const data of kpiData) {
       await page.getByTestId('add-kpi-btn').click();
@@ -224,9 +228,7 @@ test.describe('Data Insight Page', { tag: '@data-insight' }, () => {
     await page.getByTestId('date-picker-menu').click();
     await page.getByRole('menuitem', { name: 'Last 60 days' }).click();
 
-    await page
-      .getByRole('link', { name: 'App Analytics', exact: true })
-      .click();
+    await openDataInsightTab(page, 'app-analytics');
 
     await expect(page.getByTestId('summary-card-content')).toBeVisible();
     await expect(
@@ -257,7 +259,7 @@ test.describe('Data Insight Page', { tag: '@data-insight' }, () => {
     await percentageOfDataAssetWithDescriptionResponse;
     await page.getByTestId('date-picker-menu').click();
     await page.getByRole('menuitem', { name: 'Last 60 days' }).click();
-    await page.getByRole('link', { name: 'KPIs', exact: true }).click();
+    await openDataInsightTab(page, 'kpi');
 
     await expect(page.getByTestId('kpi-card')).toBeVisible();
     await expect(
@@ -289,7 +291,7 @@ test.describe('Data Insight Page', { tag: '@data-insight' }, () => {
     await latestKPIResponse;
     await percentageOfDataAssetWithDescriptionResponse;
 
-    await page.getByRole('link', { name: 'KPIs', exact: true }).click();
+    await openDataInsightTab(page, 'kpi');
 
     for (const data of kpiData) {
       await page.getByTestId(`edit-action-${data.displayName}`).click();
@@ -356,7 +358,7 @@ test.describe('Data Insight Page', { tag: '@data-insight' }, () => {
     await latestKPIResponse;
     await percentageOfDataAssetWithDescriptionResponse;
 
-    await page.getByRole('link', { name: 'KPIs', exact: true }).click();
+    await openDataInsightTab(page, 'kpi');
 
     for (const data of kpiData) {
       const kpi = getCreatedKpi(data.displayName);
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/nightly/ContextCenterFilePreview.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/nightly/ContextCenterFilePreview.spec.ts
index 59d3d2ead895..6248d5d2afa0 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/nightly/ContextCenterFilePreview.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/nightly/ContextCenterFilePreview.spec.ts
@@ -183,9 +183,10 @@ test.describe('Context Center - Document File Preview', () => {
     const modal = await openFilePreviewModal(page, row, document.id);
 
     await expect(
-      modal.getByRole('heading', { name: MARKDOWN_HEADING })
+      modal
+        .getByTestId('markdown-preview')
+        .getByRole('heading', { name: MARKDOWN_HEADING })
     ).toBeVisible();
-    await expect(modal.locator('[class*="tw:prose"]')).toBeVisible();
   });
 
   test('plain text file renders inside a pre block in the preview modal', async ({
diff --git a/openmetadata-ui/src/main/resources/ui/playwright/utils/dataInsight.ts b/openmetadata-ui/src/main/resources/ui/playwright/utils/dataInsight.ts
index 0479257cae34..0d3b01c2bfc2 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/utils/dataInsight.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/utils/dataInsight.ts
@@ -119,3 +119,11 @@ export const addKpi = async (page: Page, data: KPIData) => {
 
   return { ...kpi, id: kpi.id, fullyQualifiedName: kpi.fullyQualifiedName };
 };
+
+export const openDataInsightTab = async (
+  page: Page,
+  tab: 'kpi' | 'app-analytics'
+) => {
+  await page.getByTestId(`data-insight-tab-${tab}`).click();
+  await page.waitForURL(`**/data-insights/${tab}`);
+};
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/FilePreviewer/MarkdownRenderer.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/FilePreviewer/MarkdownRenderer.tsx
index 846f785d6539..2e577f68ed7e 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/FilePreviewer/MarkdownRenderer.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/FilePreviewer/MarkdownRenderer.tsx
@@ -40,7 +40,7 @@ const MarkdownRenderer = ({ content }: PreviewRendererProps) => {
   }, [content]);
 
   return (
-    <div className="prose tw:max-w-none tw:p-4">
+    <div className="prose tw:max-w-none tw:p-4" data-testid="markdown-preview">
       <ReactMarkdown components={getCustomMarkdownComponents()}>
         {text}
       </ReactMarkdown>
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightLeftPanel/DataInsightLeftPanel.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightLeftPanel/DataInsightLeftPanel.tsx
index fe5459bc5f37..3206b526eb72 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightLeftPanel/DataInsightLeftPanel.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightLeftPanel/DataInsightLeftPanel.tsx
@@ -36,6 +36,7 @@ const DataInsightLeftPanel = () => {
             <li key={item.key}>
               <NavItemBase
                 current={item.key === (tab ?? DataInsightTabs.DATA_ASSETS)}
+                dataTestId={`data-insight-tab-${item.key}`}
                 href={getDataInsightPathWithFqn(item.key)}
                 icon={item.icon}
                 size="sm"