diff --git a/API.md b/API.md
index 02a59da5e..357f14736 100644
--- a/API.md
+++ b/API.md
@@ -371,7 +371,7 @@ Emulating pressing the `ENTER` key on a button using `triggerKeyEvent`
 triggerKeyEvent('button', 'keydown', 'Enter');
 ```
 
-Returns **[Promise][54]<void>** resolves when the application is settled
+Returns **[Promise][54]<void>** resolves when the application is settled unless awaitSettled is false
 
 ### typeIn
 
@@ -501,6 +501,15 @@ interim DOM states (e.g. loading states, pending promises, etc).
     -   `options.timeout` **[number][62]** the time to wait (in ms) for a match (optional, default `1000`)
     -   `options.count` **[number][62]** the number of elements that should match the provided selector (null means one or more) (optional, default `null`)
 
+#### Examples
+
+Waiting until a selector is rendered:
+
+
+```javascript
+await waitFor('.my-selector', { timeout: 2000 })
+```
+
 Returns **[Promise][54]<([Element][53] \| [Array][64]<[Element][53]>)>** resolves when the element(s) appear on the page
 
 ### waitUntil
@@ -517,6 +526,17 @@ while _not_ settled (e.g. "loading" or "pending" states).
     -   `options.timeout` **[number][62]** the maximum amount of time to wait (optional, default `1000`)
     -   `options.timeoutMessage` **[string][52]** the message to use in the reject on timeout (optional, default `'waitUntil timed out'`)
 
+#### Examples
+
+Waiting until a selected element displays text:
+
+
+```javascript
+await waitUntil(function() {
+return find('.my-selector').textContent.includes('something')
+}, { timeout: 2000 })
+```
+
 Returns **[Promise][54]** resolves with the callback value when it returns a truthy value
 
 ### settled
diff --git a/addon-test-support/@ember/test-helpers/dom/wait-for.ts b/addon-test-support/@ember/test-helpers/dom/wait-for.ts
index b5a8a47bd..cca1bcaad 100644
--- a/addon-test-support/@ember/test-helpers/dom/wait-for.ts
+++ b/addon-test-support/@ember/test-helpers/dom/wait-for.ts
@@ -20,6 +20,12 @@ export interface Options {
   @param {number} [options.timeout=1000] the time to wait (in ms) for a match
   @param {number} [options.count=null] the number of elements that should match the provided selector (null means one or more)
   @return {Promise<Element|Element[]>} resolves when the element(s) appear on the page
+
+  @example
+  <caption>
+    Waiting until a selector is rendered:
+  </caption>
+  await waitFor('.my-selector', { timeout: 2000 })
 */
 export default function waitFor(
   selector: string,
diff --git a/addon-test-support/@ember/test-helpers/wait-until.ts b/addon-test-support/@ember/test-helpers/wait-until.ts
index cdcbe2e29..064b31f9f 100644
--- a/addon-test-support/@ember/test-helpers/wait-until.ts
+++ b/addon-test-support/@ember/test-helpers/wait-until.ts
@@ -22,6 +22,14 @@ export interface Options {
   @param {number} [options.timeout=1000] the maximum amount of time to wait
   @param {string} [options.timeoutMessage='waitUntil timed out'] the message to use in the reject on timeout
   @returns {Promise} resolves with the callback value when it returns a truthy value
+
+  @example
+  <caption>
+    Waiting until a selected element displays text:
+  </caption>
+  await waitUntil(function() {
+    return find('.my-selector').textContent.includes('something')
+  }, { timeout: 2000 })
 */
 export default function waitUntil<T>(
   callback: () => T | void | Falsy,