diff --git a/ui/admin/tests/acceptance/credential-store/credentials/update-test.js b/ui/admin/tests/acceptance/credential-store/credentials/update-test.js
index 9945b369a..fe9a4f1c6 100644
--- a/ui/admin/tests/acceptance/credential-store/credentials/update-test.js
+++ b/ui/admin/tests/acceptance/credential-store/credentials/update-test.js
@@ -10,7 +10,7 @@ import {
   find,
   click,
   fillIn,
-  waitUntil,
+  waitFor,
 } from '@ember/test-helpers';
 import { setupApplicationTest } from 'admin/tests/helpers';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
@@ -982,7 +982,8 @@ module(
       await click(selectors.REPLACE_SECRET_BTN);
 
       assert.dom(selectors.REPLACE_SECRET_BTN).doesNotExist();
-      await waitUntil(() => assert.dom('.CodeMirror').isVisible());
+      await waitFor(commonSelectors.CODE_EDITOR_CM);
+      assert.dom(commonSelectors.CODE_EDITOR_CM).isVisible();
     });
   },
 );
diff --git a/ui/admin/tests/helpers/selectors.js b/ui/admin/tests/helpers/selectors.js
index aae6112b5..9cb75f73c 100644
--- a/ui/admin/tests/helpers/selectors.js
+++ b/ui/admin/tests/helpers/selectors.js
@@ -95,6 +95,7 @@ export const TABLE_SORT_BTN_ARROW_DOWN = (column) =>
 
 export const CODE_EDITOR_CONTENT =
   '[data-test-code-editor-field-editor] textarea';
+export const CODE_EDITOR_CM = '[data-test-code-editor] .CodeMirror';
 
 // Toolbar refresher selectors
 export const TOOLBAR_REFRESHER = '.toolbar-refresher';