diff --git a/examples/embeddable_examples/public/hello_world/hello_world_embeddable.tsx b/examples/embeddable_examples/public/hello_world/hello_world_embeddable.tsx
index 3d0e82b6f99c1..afec509037434 100644
--- a/examples/embeddable_examples/public/hello_world/hello_world_embeddable.tsx
+++ b/examples/embeddable_examples/public/hello_world/hello_world_embeddable.tsx
@@ -33,7 +33,8 @@ export class HelloWorldEmbeddable extends Embeddable {
    * @param node
    */
   public render(node: HTMLElement) {
-    node.innerHTML = '<div data-test-subj="helloWorldEmbeddable">HELLO WORLD!</div>';
+    node.innerHTML =
+      '<div data-test-subj="helloWorldEmbeddable" data-render-complete="true">HELLO WORLD!</div>';
   }
 
   /**
diff --git a/examples/embeddable_examples/public/todo/todo_component.tsx b/examples/embeddable_examples/public/todo/todo_component.tsx
index 10d48881c72e5..f2ba44de407ee 100644
--- a/examples/embeddable_examples/public/todo/todo_component.tsx
+++ b/examples/embeddable_examples/public/todo/todo_component.tsx
@@ -41,7 +41,7 @@ function wrapSearchTerms(task: string, search?: string) {
 
 export function TodoEmbeddableComponentInner({ input: { icon, title, task, search } }: Props) {
   return (
-    <EuiFlexGroup gutterSize="none">
+    <EuiFlexGroup gutterSize="none" data-render-complete="true">
       <EuiFlexItem grow={false}>
         {icon ? <EuiIcon type={icon} size="l" /> : <EuiAvatar name={title || task} size="l" />}
       </EuiFlexItem>
diff --git a/examples/embeddable_examples/public/todo/todo_ref_component.tsx b/examples/embeddable_examples/public/todo/todo_ref_component.tsx
index 53ed20042dc5b..d70db903d1dac 100644
--- a/examples/embeddable_examples/public/todo/todo_ref_component.tsx
+++ b/examples/embeddable_examples/public/todo/todo_ref_component.tsx
@@ -45,7 +45,7 @@ export function TodoRefEmbeddableComponentInner({
   const title = savedAttributes?.title;
   const task = savedAttributes?.task;
   return (
-    <EuiFlexGroup>
+    <EuiFlexGroup data-render-complete="true">
       <EuiFlexItem grow={false}>
         {icon ? (
           <EuiIcon type={icon} size="l" />
diff --git a/test/examples/embeddables/dashboard.ts b/test/examples/embeddables/dashboard.ts
index 827eb3bb121f1..51284e57f81ec 100644
--- a/test/examples/embeddables/dashboard.ts
+++ b/test/examples/embeddables/dashboard.ts
@@ -97,7 +97,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
   const pieChart = getService('pieChart');
   const dashboardExpect = getService('dashboardExpect');
   const elasticChart = getService('elasticChart');
-  const PageObjects = getPageObjects(['common', 'visChart', 'header']);
+  const PageObjects = getPageObjects(['common', 'visChart', 'dashboard']);
   const monacoEditor = getService('monacoEditor');
 
   describe.only('dashboard container', () => {
@@ -108,7 +108,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
       );
       await PageObjects.common.navigateToApp('dashboardEmbeddableExamples');
       await testSubjects.click('dashboardEmbeddableByValue');
-      await PageObjects.header.waitUntilLoadingHasFinished();
+      await PageObjects.dashboard.waitForRenderComplete();
 
       await updateInput(JSON.stringify(testDashboardInput, null, 4));
     });