diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_button_flyout.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_button_flyout.tsx
index 86b1c879417bbf..14b743997f30a2 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_button_flyout.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_button_flyout.tsx
@@ -133,7 +133,7 @@ export const EditButtonFlyout: FC<Required<EditAction>> = ({ closeFlyout, item }
         onClose={closeFlyout}
         hideCloseButton
         aria-labelledby="analyticsEditFlyoutTitle"
-        data-test-subj="analyticsEditFlyout"
+        data-test-subj="mlAnalyticsEditFlyout"
       >
         <EuiFlyoutHeader hasBorder>
           <EuiTitle size="m">
@@ -297,7 +297,7 @@ export const EditButtonFlyout: FC<Required<EditAction>> = ({ closeFlyout, item }
             </EuiFlexItem>
             <EuiFlexItem grow={false}>
               <EuiButton
-                data-test-subj="analyticsEditFlyoutUpdateButton"
+                data-test-subj="mlAnalyticsEditFlyoutUpdateButton"
                 onClick={onSubmit}
                 fill
                 isDisabled={updateButtonDisabled}
diff --git a/x-pack/test/functional/services/ml/data_frame_analytics_edit.ts b/x-pack/test/functional/services/ml/data_frame_analytics_edit.ts
index 54f66cad3cecf6..fd06dd24d6f8be 100644
--- a/x-pack/test/functional/services/ml/data_frame_analytics_edit.ts
+++ b/x-pack/test/functional/services/ml/data_frame_analytics_edit.ts
@@ -57,12 +57,12 @@ export function MachineLearningDataFrameAnalyticsEditProvider(
     },
 
     async assertAnalyticsEditFlyoutMissing() {
-      await testSubjects.missingOrFail('analyticsEditFlyoutUpdateButton');
+      await testSubjects.missingOrFail('mlAnalyticsEditFlyout');
     },
 
     async updateAnalyticsJob() {
-      await testSubjects.existOrFail('analyticsEditFlyoutUpdateButton');
-      await testSubjects.click('analyticsEditFlyoutUpdateButton');
+      await testSubjects.existOrFail('mlAnalyticsEditFlyoutUpdateButton');
+      await testSubjects.click('mlAnalyticsEditFlyoutUpdateButton');
       await retry.tryForTime(5000, async () => {
         await this.assertAnalyticsEditFlyoutMissing();
       });
diff --git a/x-pack/test/functional/services/ml/data_frame_analytics_table.ts b/x-pack/test/functional/services/ml/data_frame_analytics_table.ts
index cff2eb402630c0..608a1f2bee3e10 100644
--- a/x-pack/test/functional/services/ml/data_frame_analytics_table.ts
+++ b/x-pack/test/functional/services/ml/data_frame_analytics_table.ts
@@ -91,7 +91,7 @@ export function MachineLearningDataFrameAnalyticsTableProvider({ getService }: F
     public async openEditFlyout(analyticsId: string) {
       await this.openRowActions(analyticsId);
       await testSubjects.click('mlAnalyticsJobEditButton');
-      await testSubjects.existOrFail('analyticsEditFlyout', { timeout: 5000 });
+      await testSubjects.existOrFail('mlAnalyticsEditFlyout', { timeout: 5000 });
     }
 
     async assertAnalyticsSearchInputValue(expectedSearchValue: string) {