diff --git a/changelogs/fragments/8682.yml b/changelogs/fragments/8682.yml
new file mode 100644
index 00000000000..88ed71c168e
--- /dev/null
+++ b/changelogs/fragments/8682.yml
@@ -0,0 +1,2 @@
+feat:
+- Add data test subject for discover cypress test ([#8682](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8682))
\ No newline at end of file
diff --git a/src/plugins/data/public/query/query_string/language_service/lib/language_reference.tsx b/src/plugins/data/public/query/query_string/language_service/lib/language_reference.tsx
index 0d21790362e..ef8eafaeddd 100644
--- a/src/plugins/data/public/query/query_string/language_service/lib/language_reference.tsx
+++ b/src/plugins/data/public/query/query_string/language_service/lib/language_reference.tsx
@@ -21,6 +21,7 @@ export const LanguageReference = (props: { body: ReactFragment }) => {
           defaultMessage: `Language Reference`,
         })}
         onClick={() => setIsLanguageReferenceOpen(!isLanguageReferenceOpen)}
+        data-test-subj="languageReferenceButton"
       />
     </div>
   );
diff --git a/src/plugins/data/public/ui/dataset_selector/configurator.tsx b/src/plugins/data/public/ui/dataset_selector/configurator.tsx
index d99fe6d4687..2a509eeed28 100644
--- a/src/plugins/data/public/ui/dataset_selector/configurator.tsx
+++ b/src/plugins/data/public/ui/dataset_selector/configurator.tsx
@@ -180,6 +180,7 @@ export const Configurator = ({
                     setDataset({ ...dataset, timeFieldName: value });
                   }}
                   hasNoInitialSelection
+                  data-test-subj="advancedSelectorTimeFieldSelect"
                 />
               </EuiFormRow>
             ))}
@@ -205,6 +206,7 @@ export const Configurator = ({
           }}
           fill
           disabled={submitDisabled}
+          data-test-subj="advancedSelectorConfirmButton"
         >
           <FormattedMessage
             id="data.explorer.datasetSelector.advancedSelector.confirm"
diff --git a/src/plugins/data/public/ui/dataset_selector/dataset_explorer.tsx b/src/plugins/data/public/ui/dataset_selector/dataset_explorer.tsx
index bbdc89a980f..7861dd836cd 100644
--- a/src/plugins/data/public/ui/dataset_selector/dataset_explorer.tsx
+++ b/src/plugins/data/public/ui/dataset_selector/dataset_explorer.tsx
@@ -229,6 +229,7 @@ export const DatasetExplorer = ({
           <FormattedMessage
             id="data.explorer.datasetSelector.advancedSelector.cancel"
             defaultMessage="Cancel"
+            data-test-subj="datasetSelectorCancel"
           />
         </EuiButtonEmpty>
         <EuiButton
@@ -237,6 +238,7 @@ export const DatasetExplorer = ({
           iconType="arrowRight"
           iconSide="right"
           fill
+          data-test-subj="datasetSelectorNext"
         >
           <FormattedMessage
             id="data.explorer.datasetSelector.advancedSelector.next"
diff --git a/src/plugins/data/public/ui/dataset_selector/dataset_selector.tsx b/src/plugins/data/public/ui/dataset_selector/dataset_selector.tsx
index 691f477a581..5e1d874d14c 100644
--- a/src/plugins/data/public/ui/dataset_selector/dataset_selector.tsx
+++ b/src/plugins/data/public/ui/dataset_selector/dataset_selector.tsx
@@ -146,6 +146,7 @@ export const DatasetSelector = ({
           checked: id === selectedDatasetId ? 'on' : undefined,
           key: id,
           prepend: <EuiIcon type={datasetService.getType(type)!.meta.icon.type} />,
+          'data-test-subj': `datasetOption-${id}`,
         });
       });
       return datasetOptions.length > 1 ? datasetOptions : [];
diff --git a/src/plugins/data/public/ui/query_editor/__snapshots__/language_selector.test.tsx.snap b/src/plugins/data/public/ui/query_editor/__snapshots__/language_selector.test.tsx.snap
index 68e06485f77..a52e08750dd 100644
--- a/src/plugins/data/public/ui/query_editor/__snapshots__/language_selector.test.tsx.snap
+++ b/src/plugins/data/public/ui/query_editor/__snapshots__/language_selector.test.tsx.snap
@@ -507,6 +507,7 @@ exports[`LanguageSelector should select DQL if language is kuery 1`] = `
       button={
         <EuiSmallButtonEmpty
           className="languageSelector__button"
+          data-test-subj="queryEditorLanguageSelector"
           iconSide="right"
           iconType="arrowDown"
           onClick={[Function]}
@@ -530,12 +531,14 @@ exports[`LanguageSelector should select DQL if language is kuery 1`] = `
         >
           <EuiSmallButtonEmpty
             className="languageSelector__button"
+            data-test-subj="queryEditorLanguageSelector"
             iconSide="right"
             iconType="arrowDown"
             onClick={[Function]}
           >
             <EuiButtonEmpty
               className="languageSelector__button"
+              data-test-subj="queryEditorLanguageSelector"
               iconSide="right"
               iconType="arrowDown"
               onClick={[Function]}
@@ -543,6 +546,7 @@ exports[`LanguageSelector should select DQL if language is kuery 1`] = `
             >
               <button
                 className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small languageSelector__button"
+                data-test-subj="queryEditorLanguageSelector"
                 disabled={false}
                 onClick={[Function]}
                 type="button"
@@ -1099,6 +1103,7 @@ exports[`LanguageSelector should select lucene if language is lucene 1`] = `
       button={
         <EuiSmallButtonEmpty
           className="languageSelector__button"
+          data-test-subj="queryEditorLanguageSelector"
           iconSide="right"
           iconType="arrowDown"
           onClick={[Function]}
@@ -1122,12 +1127,14 @@ exports[`LanguageSelector should select lucene if language is lucene 1`] = `
         >
           <EuiSmallButtonEmpty
             className="languageSelector__button"
+            data-test-subj="queryEditorLanguageSelector"
             iconSide="right"
             iconType="arrowDown"
             onClick={[Function]}
           >
             <EuiButtonEmpty
               className="languageSelector__button"
+              data-test-subj="queryEditorLanguageSelector"
               iconSide="right"
               iconType="arrowDown"
               onClick={[Function]}
@@ -1135,6 +1142,7 @@ exports[`LanguageSelector should select lucene if language is lucene 1`] = `
             >
               <button
                 className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small languageSelector__button"
+                data-test-subj="queryEditorLanguageSelector"
                 disabled={false}
                 onClick={[Function]}
                 type="button"
diff --git a/src/plugins/data/public/ui/query_editor/editors/default_editor/index.tsx b/src/plugins/data/public/ui/query_editor/editors/default_editor/index.tsx
index 0d76ff0e78f..1eaf373f2c8 100644
--- a/src/plugins/data/public/ui/query_editor/editors/default_editor/index.tsx
+++ b/src/plugins/data/public/ui/query_editor/editors/default_editor/index.tsx
@@ -32,7 +32,7 @@ export const DefaultInput: React.FC<DefaultInputProps> = ({
   provideCompletionItems,
 }) => {
   return (
-    <div className="defaultEditor">
+    <div className="defaultEditor" data-test-subj="osdQueryEditor__multiLine">
       <div ref={headerRef} className="defaultEditor__header" />
       <CodeEditor
         height={100}
diff --git a/src/plugins/data/public/ui/query_editor/editors/shared.tsx b/src/plugins/data/public/ui/query_editor/editors/shared.tsx
index ab7ad44bbf7..52370931da5 100644
--- a/src/plugins/data/public/ui/query_editor/editors/shared.tsx
+++ b/src/plugins/data/public/ui/query_editor/editors/shared.tsx
@@ -64,7 +64,10 @@ export const SingleLineInput: React.FC<SingleLineInputProps> = ({
 }) => (
   <div className="euiFormControlLayout euiFormControlLayout--compressed euiFormControlLayout--group osdQueryBar__wrap">
     {prepend}
-    <div className="osdQuerEditor__singleLine euiFormControlLayout__childrenWrapper">
+    <div
+      className="osdQuerEditor__singleLine euiFormControlLayout__childrenWrapper"
+      data-test-subj="osdQueryEditor__singleLine"
+    >
       <CodeEditor
         height={20} // Adjusted to match lineHeight for a single line
         languageId={languageId}
diff --git a/src/plugins/data/public/ui/query_editor/language_selector.tsx b/src/plugins/data/public/ui/query_editor/language_selector.tsx
index 6fc0606c199..28ab7cf1acd 100644
--- a/src/plugins/data/public/ui/query_editor/language_selector.tsx
+++ b/src/plugins/data/public/ui/query_editor/language_selector.tsx
@@ -114,6 +114,7 @@ export const QueryLanguageSelector = (props: QueryLanguageSelectorProps) => {
           onClick={onButtonClick}
           className="languageSelector__button"
           iconType="arrowDown"
+          data-test-subj="queryEditorLanguageSelector"
         >
           {selectedLanguage.label}
         </EuiSmallButtonEmpty>
diff --git a/src/plugins/data/public/ui/query_editor/query_editor.tsx b/src/plugins/data/public/ui/query_editor/query_editor.tsx
index b4299cb6c82..6db7a9360a4 100644
--- a/src/plugins/data/public/ui/query_editor/query_editor.tsx
+++ b/src/plugins/data/public/ui/query_editor/query_editor.tsx
@@ -379,7 +379,7 @@ export default class QueryEditorUI extends Component<Props, State> {
           <EuiText size="xs" color="subdued">
             {`${this.state.lineCount} ${this.state.lineCount === 1 ? 'line' : 'lines'}`}
           </EuiText>,
-          <EuiText size="xs" color="subdued">
+          <EuiText size="xs" color="subdued" data-test-subj="queryEditorFooterTimestamp">
             {this.props.query.dataset?.timeFieldName || ''}
           </EuiText>,
           <QueryResult queryStatus={this.props.queryStatus!} />,
diff --git a/src/plugins/discover/public/application/components/no_index_patterns/no_index_patterns.tsx b/src/plugins/discover/public/application/components/no_index_patterns/no_index_patterns.tsx
index 7906a2f0604..409f7b8a7d1 100644
--- a/src/plugins/discover/public/application/components/no_index_patterns/no_index_patterns.tsx
+++ b/src/plugins/discover/public/application/components/no_index_patterns/no_index_patterns.tsx
@@ -27,6 +27,7 @@ export const DiscoverNoIndexPatterns: React.FC = () => {
       alignItems="center"
       gutterSize="none"
       className="discoverNoIndexPatterns-centerPanel"
+      data-test-subj="discoverNoIndexPatterns"
     >
       <EuiFlexItem grow={false}>
         <EuiPanel paddingSize="l">