diff --git a/.github/workflows/cypress-workflow-bundle-snapshot-based.yml b/.github/workflows/cypress-workflow-bundle-snapshot-based.yml
index b1038c86d..1420d9b72 100644
--- a/.github/workflows/cypress-workflow-bundle-snapshot-based.yml
+++ b/.github/workflows/cypress-workflow-bundle-snapshot-based.yml
@@ -24,7 +24,7 @@ jobs:
     uses: ./.github/workflows/release-e2e-workflow-template.yml
     with:
       test-name: Core Dashboards using Bundle Snapshot
-      test-command: env CYPRESS_ML_COMMONS_DASHBOARDS_ENABLED=true CYPRESS_VISBUILDER_ENABLED=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=true yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/**/*.js'
+      test-command: env CYPRESS_ML_COMMONS_DASHBOARDS_ENABLED=true CYPRESS_VISBUILDER_ENABLED=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=true yarn cypress:run-with-security --browser chromium --spec 'cypress/e2e/core-opensearch-dashboards/opensearch-dashboards/**/*.js'
       osd-serve-args: --data_source.enabled=true --vis_builder.enabled=true --ml_commons_dashboards.enabled=true
 
   tests-without-security:
@@ -33,6 +33,6 @@ jobs:
     uses: ./.github/workflows/release-e2e-workflow-template.yml
     with:
       test-name: Core Dashboards using Bundle Snapshot
-      test-command: env CYPRESS_ML_COMMONS_DASHBOARDS_ENABLED=true CYPRESS_VISBUILDER_ENABLED=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=true yarn cypress:run-without-security --browser chromium --spec 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/**/*.js'
+      test-command: env CYPRESS_ML_COMMONS_DASHBOARDS_ENABLED=true CYPRESS_VISBUILDER_ENABLED=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=true yarn cypress:run-without-security --browser chromium --spec 'cypress/e2e/core-opensearch-dashboards/opensearch-dashboards/**/*.js'
       osd-serve-args: --data_source.enabled=true --vis_builder.enabled=true --ml_commons_dashboards.enabled=true
       security-enabled: false
diff --git a/package.json b/package.json
index ad3d99748..4bc882a01 100644
--- a/package.json
+++ b/package.json
@@ -9,18 +9,18 @@
     "cypress:run-without-security": "env TZ=America/Los_Angeles NO_COLOR=1 cypress run --headless --env SECURITY_ENABLED=false",
     "cypress:run-with-security": "env TZ=America/Los_Angeles NO_COLOR=1 cypress run --headless --env SECURITY_ENABLED=true,openSearchUrl=https://localhost:9200",
     "cypress:run-with-security-and-aggregation-view": "env TZ=America/Los_Angeles NO_COLOR=1 cypress run --headless --env SECURITY_ENABLED=true,openSearchUrl=https://localhost:9200,AGGREGATION_VIEW=true",
-    "cypress:run-plugin-tests-without-security": "yarn cypress:run-without-security --spec 'cypress/integration/plugins/*/*.js'",
-    "cypress:run-plugin-tests-with-security": "yarn cypress:run-with-security --spec 'cypress/integration/plugins/*/*.js'",
-    "cypress:release-chrome": "yarn cypress:run-with-security --browser chrome --spec 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/*.js,cypress/integration/plugins/*/*'",
-    "cypress:release-electron": "yarn cypress:run-with-security --browser electron --spec 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/*.js,cypress/integration/plugins/*/*'",
-    "cypress:release-chromium": "yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/*.js,cypress/integration/plugins/*/*'",
-    "cypress:release-chromium-10": "yarn cypress:run-with-security --browser chromium --config numTestsKeptInMemory=10 --spec 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/*.js,cypress/integration/plugins/*/*'",
-    "cypress:release-chromium-20": "yarn cypress:run-with-security --browser chromium --config numTestsKeptInMemory=20 --spec 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/*.js,cypress/integration/plugins/*/*'",
-    "cypress:release-chromium-5": "yarn cypress:run-with-security --browser chromium --config numTestsKeptInMemory=5 --spec 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/*.js,cypress/integration/plugins/*/*'",
-    "cypress:release-chromium-0": "yarn cypress:run-with-security --browser chromium --config numTestsKeptInMemory=0 --spec 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/*.js,cypress/integration/plugins/*/*'",
-    "cypress:release-firefox": "yarn cypress:run-with-security --browser firefox --spec 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/*.js,cypress/integration/plugins/*/*'",
-    "cypress:release-ad-only": "yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/plugins/anomaly-detection-dashboards-plugin/*'",
-    "cypress:release-ism-only": "yarn cypress:run-with-security --browser chromium --spec 'cypress/integration/plugins/index-management-dashboards-plugin/*'",
+    "cypress:run-plugin-tests-without-security": "yarn cypress:run-without-security --spec 'cypress/e2e/plugins/*/*.js'",
+    "cypress:run-plugin-tests-with-security": "yarn cypress:run-with-security --spec 'cypress/e2e/plugins/*/*.js'",
+    "cypress:release-chrome": "yarn cypress:run-with-security --browser chrome --spec 'cypress/e2e/core-opensearch-dashboards/opensearch-dashboards/*.js,cypress/e2e/plugins/*/*'",
+    "cypress:release-electron": "yarn cypress:run-with-security --browser electron --spec 'cypress/e2e/core-opensearch-dashboards/opensearch-dashboards/*.js,cypress/e2e/plugins/*/*'",
+    "cypress:release-chromium": "yarn cypress:run-with-security --browser chromium --spec 'cypress/e2e/core-opensearch-dashboards/opensearch-dashboards/*.js,cypress/e2e/plugins/*/*'",
+    "cypress:release-chromium-10": "yarn cypress:run-with-security --browser chromium --config numTestsKeptInMemory=10 --spec 'cypress/e2e/core-opensearch-dashboards/opensearch-dashboards/*.js,cypress/e2e/plugins/*/*'",
+    "cypress:release-chromium-20": "yarn cypress:run-with-security --browser chromium --config numTestsKeptInMemory=20 --spec 'cypress/e2e/core-opensearch-dashboards/opensearch-dashboards/*.js,cypress/e2e/plugins/*/*'",
+    "cypress:release-chromium-5": "yarn cypress:run-with-security --browser chromium --config numTestsKeptInMemory=5 --spec 'cypress/e2e/core-opensearch-dashboards/opensearch-dashboards/*.js,cypress/e2e/plugins/*/*'",
+    "cypress:release-chromium-0": "yarn cypress:run-with-security --browser chromium --config numTestsKeptInMemory=0 --spec 'cypress/e2e/core-opensearch-dashboards/opensearch-dashboards/*.js,cypress/e2e/plugins/*/*'",
+    "cypress:release-firefox": "yarn cypress:run-with-security --browser firefox --spec 'cypress/e2e/core-opensearch-dashboards/opensearch-dashboards/*.js,cypress/e2e/plugins/*/*'",
+    "cypress:release-ad-only": "yarn cypress:run-with-security --browser chromium --spec 'cypress/e2e/plugins/anomaly-detection-dashboards-plugin/*'",
+    "cypress:release-ism-only": "yarn cypress:run-with-security --browser chromium --spec 'cypress/e2e/plugins/index-management-dashboards-plugin/*'",
     "lint": "eslint . --ext .js",
     "pkg-version": "./scripts/getpkgversion.sh",
     "generate:test-data": "node ./scripts/generate_data/index.js",
diff --git a/test_finder.sh b/test_finder.sh
index ee4314641..127311082 100755
--- a/test_finder.sh
+++ b/test_finder.sh
@@ -3,8 +3,8 @@
 set -e
 
 OSD_BUILD_MANIFEST='../local-test-cluster/opensearch-dashboards-*/manifest.yml'
-OSD_TEST_PATH='cypress/integration/core-opensearch-dashboards'
-OSD_PLUGIN_TEST_PATH='cypress/integration/plugins'
+OSD_TEST_PATH='cypress/e2e/core-opensearch-dashboards'
+OSD_PLUGIN_TEST_PATH='cypress/e2e/plugins'
 TEST_TYPE=$OPTION
 
 # Map component name in opensearch-build repo INPUT_MANIFEST with folder name for tests in functional repo