diff --git a/packages/kbn-dom-drag-drop/src/draggable.tsx b/packages/kbn-dom-drag-drop/src/draggable.tsx
index f5edb5176a658..a547ec6c44b98 100644
--- a/packages/kbn-dom-drag-drop/src/draggable.tsx
+++ b/packages/kbn-dom-drag-drop/src/draggable.tsx
@@ -345,20 +345,7 @@ const DraggableImpl = memo(function DraggableImpl({
     hoveredDropTarget.dropType !== 'reorder';
 
   return (
-    <div
-      className={classNames(className, 'domDraggable', {
-        'domDraggable_active--move': draggedItemProps && dragType === 'move' && !keyboardMode,
-        'domDraggable_dragover_keyboard--move': shouldShowGhostImageInstead,
-        'domDraggable_active--copy': draggedItemProps && dragType === 'copy' && !keyboardMode,
-        'domDraggable_dragover_keyboard--copy':
-          keyboardMode && draggedItemProps && hoveredDropTarget,
-      })}
-      data-test-subj={dataTestSubj || `${dataTestSubjPrefix}_domDraggable_${value.humanData.label}`}
-      draggable
-      onDragEnd={dragEnd}
-      onDragStart={dragStart}
-      onMouseDown={removeSelection}
-    >
+    <>
       <EuiScreenReaderOnly showOnFocus>
         <button
           aria-label={value.humanData.label}
@@ -402,8 +389,25 @@ const DraggableImpl = memo(function DraggableImpl({
           onKeyUp={modifierHandlers.onKeyUp}
         />
       </EuiScreenReaderOnly>
-      {children}
-    </div>
+      <div
+        className={classNames(className, 'domDraggable', {
+          'domDraggable_active--move': draggedItemProps && dragType === 'move' && !keyboardMode,
+          'domDraggable_dragover_keyboard--move': shouldShowGhostImageInstead,
+          'domDraggable_active--copy': draggedItemProps && dragType === 'copy' && !keyboardMode,
+          'domDraggable_dragover_keyboard--copy':
+            keyboardMode && draggedItemProps && hoveredDropTarget,
+        })}
+        data-test-subj={
+          dataTestSubj || `${dataTestSubjPrefix}_domDraggable_${value.humanData.label}`
+        }
+        draggable
+        onDragEnd={dragEnd}
+        onDragStart={dragStart}
+        onMouseDown={removeSelection}
+      >
+        {children}
+      </div>
+    </>
   );
 });
 
diff --git a/test/functional/page_objects/discover_page.ts b/test/functional/page_objects/discover_page.ts
index 56f6e53ffa052..3c3d61127330a 100644
--- a/test/functional/page_objects/discover_page.ts
+++ b/test/functional/page_objects/discover_page.ts
@@ -809,7 +809,7 @@ export class DiscoverPageObject extends FtrService {
    * */
   public async dragFieldWithKeyboardToTable(fieldName: string) {
     const field = await this.find.byCssSelector(
-      `[data-test-subj="dscFieldListPanelField-${fieldName}"] [data-test-subj="domDragDrop-keyboardHandler"]`
+      `[data-attr-field="${fieldName}"] [data-test-subj="domDragDrop-keyboardHandler"]`
     );
     await field.focus();
     await this.retry.try(async () => {
diff --git a/x-pack/plugins/lens/public/datasources/common/field_item.tsx b/x-pack/plugins/lens/public/datasources/common/field_item.tsx
index b76dc9f4b9641..78e2dfa0dd146 100644
--- a/x-pack/plugins/lens/public/datasources/common/field_item.tsx
+++ b/x-pack/plugins/lens/public/datasources/common/field_item.tsx
@@ -246,7 +246,7 @@ export function InnerFieldItem(props: FieldItemProps) {
   }, [dataViewField, filters, hideDetails, indexPattern, query, services]);
 
   return (
-    <li>
+    <li data-attr-field={field.name}>
       <FieldPopover
         isOpen={infoIsOpen}
         closePopover={closePopover}
diff --git a/x-pack/test/functional/page_objects/lens_page.ts b/x-pack/test/functional/page_objects/lens_page.ts
index 310f52f7e651b..1dce9d8d083df 100644
--- a/x-pack/test/functional/page_objects/lens_page.ts
+++ b/x-pack/test/functional/page_objects/lens_page.ts
@@ -397,7 +397,7 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
       metaKey?: 'shift' | 'alt' | 'ctrl'
     ) {
       const field = await find.byCssSelector(
-        `[data-test-subj="lnsFieldListPanelField-${fieldName}"] [data-test-subj="lnsDragDrop-keyboardHandler"]`
+        `[data-attr-field="${fieldName}"] [data-test-subj="lnsDragDrop-keyboardHandler"]`
       );
       await field.focus();
       await retry.try(async () => {
@@ -432,17 +432,21 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
       metaKey?: 'shift' | 'alt' | 'ctrl'
     ) {
       const elements = await find.allByCssSelector(
-        `[data-test-subj="${group}"]  [data-test-subj="lnsDragDrop-keyboardHandler"]`
+        `[data-test-subj="${group}"] [data-test-subj="lnsDragDrop-keyboardHandler"]`
       );
       const el = elements[index];
       await el.focus();
       await browser.pressKeys(browser.keys.ENTER);
       for (let i = 0; i < steps; i++) {
+        // This needs to be slowed down to avoid flakiness
+        await common.sleep(200);
         await browser.pressKeys(reverse ? browser.keys.LEFT : browser.keys.RIGHT);
       }
       if (metaKey) {
         await this.pressMetaKey(metaKey);
       }
+
+      await common.sleep(200);
       await browser.pressKeys(browser.keys.ENTER);
 
       await this.waitForLensDragDropToFinish();
@@ -464,8 +468,12 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
       await el.focus();
       await browser.pressKeys(browser.keys.ENTER);
       for (let i = 0; i < steps; i++) {
+        // This needs to be slowed down to avoid flakiness
+        await common.sleep(200);
         await browser.pressKeys(reverse ? browser.keys.ARROW_UP : browser.keys.ARROW_DOWN);
       }
+
+      await common.sleep(200);
       await browser.pressKeys(browser.keys.ENTER);
 
       await this.waitForLensDragDropToFinish();
@@ -1528,10 +1536,10 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
      */
     async assertFocusedField(name: string) {
       const input = await find.activeElement();
-      const fieldAncestor = await input.findByXpath('./../..');
-      const focusedElementText = await fieldAncestor.getVisibleText();
-      const dataTestSubj = await fieldAncestor.getAttribute('data-test-subj');
+      const fieldPopover = await input.findByXpath('./..');
+      const focusedElementText = await fieldPopover.getVisibleText();
       expect(focusedElementText).to.eql(name);
+      const dataTestSubj = await fieldPopover.getAttribute('data-test-subj');
       expect(dataTestSubj).to.eql('lnsFieldListPanelField');
     },
 
@@ -1542,7 +1550,7 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
      */
     async assertFocusedDimension(name: string) {
       const input = await find.activeElement();
-      const fieldAncestor = await input.findByXpath('./../../..');
+      const fieldAncestor = await input.findByXpath('./../..');
       const focusedElementText = await fieldAncestor.getVisibleText();
       expect(focusedElementText).to.eql(name);
     },