diff --git a/x-pack/plugins/grokdebugger/public/components/grok_debugger/grok_debugger.js b/x-pack/plugins/grokdebugger/public/components/grok_debugger/grok_debugger.js
index aa566b056280..17a6408298b0 100644
--- a/x-pack/plugins/grokdebugger/public/components/grok_debugger/grok_debugger.js
+++ b/x-pack/plugins/grokdebugger/public/components/grok_debugger/grok_debugger.js
@@ -129,7 +129,7 @@ export class GrokDebuggerComponent extends React.Component {
         <EuiPageBody>
           <EuiPageContent>
             <EuiPageContentBody>
-              <EuiForm className="grokdebugger-container" data-test-subj="grokDebugger">
+              <EuiForm className="grokdebugger-container" data-test-subj="grokDebuggerContainer">
                 <EventInput value={this.state.rawEvent} onChange={this.onRawEventChange} />
                 <PatternInput value={this.state.pattern} onChange={this.onPatternChange} />
                 <EuiSpacer />
diff --git a/x-pack/test/functional/apps/grok_debugger/grok_debugger.js b/x-pack/test/functional/apps/grok_debugger/grok_debugger.js
index 010341cedd3a..b2a1c5363fcb 100644
--- a/x-pack/test/functional/apps/grok_debugger/grok_debugger.js
+++ b/x-pack/test/functional/apps/grok_debugger/grok_debugger.js
@@ -12,8 +12,7 @@ export default function ({ getService, getPageObjects }) {
 
   const PageObjects = getPageObjects(['grokDebugger']);
 
-  // FLAKY: https://github.com/elastic/kibana/issues/84440
-  describe.skip('grok debugger app', function () {
+  describe('grok debugger app', function () {
     this.tags('includeFirefox');
     before(async () => {
       await esArchiver.load('empty_kibana');
diff --git a/x-pack/test/functional/services/grok_debugger.js b/x-pack/test/functional/services/grok_debugger.js
index 730b4ca60c05..42a80edd70c8 100644
--- a/x-pack/test/functional/services/grok_debugger.js
+++ b/x-pack/test/functional/services/grok_debugger.js
@@ -13,7 +13,7 @@ export function GrokDebuggerProvider({ getService }) {
   const retry = getService('retry');
 
   // test subject selectors
-  const SUBJ_CONTAINER = 'grokDebugger';
+  const SUBJ_CONTAINER = 'grokDebuggerContainer';
 
   const SUBJ_UI_ACE_EVENT_INPUT = `${SUBJ_CONTAINER} > aceEventInput > codeEditorContainer`;
   const SUBJ_UI_ACE_PATTERN_INPUT = `${SUBJ_CONTAINER} > acePatternInput > codeEditorContainer`;
@@ -49,10 +49,8 @@ export function GrokDebuggerProvider({ getService }) {
     }
 
     async assertExists() {
-      await retry.try(async () => {
-        if (!(await testSubjects.exists(SUBJ_CONTAINER))) {
-          throw new Error('Expected to find the grok debugger');
-        }
+      await retry.waitFor('Grok Debugger to exist', async () => {
+        return await testSubjects.exists(SUBJ_CONTAINER);
       });
     }