diff --git a/capture/engine_scripts/puppet/clickAndHoverHelper.js b/capture/engine_scripts/puppet/clickAndHoverHelper.js
index 17e4a2b32..81ff30e8f 100644
--- a/capture/engine_scripts/puppet/clickAndHoverHelper.js
+++ b/capture/engine_scripts/puppet/clickAndHoverHelper.js
@@ -7,31 +7,31 @@ module.exports = async (page, scenario) => {
 
   if (keyPressSelector) {
     for (const keyPressSelectorItem of [].concat(keyPressSelector)) {
-      await page.waitForTimeout(keyPressSelectorItem.selector);
+      await page.waitFor(keyPressSelectorItem.selector);
       await page.type(keyPressSelectorItem.selector, keyPressSelectorItem.keyPress);
     }
   }
 
   if (hoverSelector) {
     for (const hoverSelectorIndex of [].concat(hoverSelector)) {
-      await page.waitForTimeout(hoverSelectorIndex);
+      await page.waitFor(hoverSelectorIndex);
       await page.hover(hoverSelectorIndex);
     }
   }
 
   if (clickSelector) {
     for (const clickSelectorIndex of [].concat(clickSelector)) {
-      await page.waitForTimeout(clickSelectorIndex);
+      await page.waitFor(clickSelectorIndex);
       await page.click(clickSelectorIndex);
     }
   }
 
   if (postInteractionWait) {
-    await page.waitForTimeout(postInteractionWait);
+    await page.waitFor(postInteractionWait);
   }
 
   if (scrollToSelector) {
-    await page.waitForTimeout(scrollToSelector);
+    await page.waitFor(scrollToSelector);
     await page.evaluate(scrollToSelector => {
       document.querySelector(scrollToSelector).scrollIntoView();
     }, scrollToSelector);
diff --git a/core/util/runPuppet.js b/core/util/runPuppet.js
index a8b3bb8ed..903833913 100644
--- a/core/util/runPuppet.js
+++ b/core/util/runPuppet.js
@@ -132,13 +132,13 @@ async function processScenarioView (scenario, variantOrScenarioLabelSafe, scenar
 
     // --- WAIT FOR SELECTOR ---
     if (scenario.readySelector) {
-      await page.waitForTimeout(scenario.readySelector);
+      await page.waitFor(scenario.readySelector);
     }
     //
 
     // --- DELAY ---
     if (scenario.delay > 0) {
-      await page.waitForTimeout(scenario.delay);
+      await page.waitFor(scenario.delay);
     }
 
     // --- REMOVE SELECTORS ---
diff --git a/examples/Jenkins/Sample/backstop_data/engine_scripts/puppet/clickAndHoverHelper.js b/examples/Jenkins/Sample/backstop_data/engine_scripts/puppet/clickAndHoverHelper.js
index 12231f91f..269f72830 100644
--- a/examples/Jenkins/Sample/backstop_data/engine_scripts/puppet/clickAndHoverHelper.js
+++ b/examples/Jenkins/Sample/backstop_data/engine_scripts/puppet/clickAndHoverHelper.js
@@ -4,16 +4,16 @@ module.exports = async (page, scenario) => {
   const postInteractionWait = scenario.postInteractionWait; // selector [str] | ms [int]
 
   if (hoverSelector) {
-    await page.waitForTimeout(hoverSelector);
+    await page.waitFor(hoverSelector);
     await page.hover(hoverSelector);
   }
 
   if (clickSelector) {
-    await page.waitForTimeout(clickSelector);
+    await page.waitFor(clickSelector);
     await page.click(clickSelector);
   }
 
   if (postInteractionWait) {
-    await page.waitForTimeout(postInteractionWait);
+    await page.waitFor(postInteractionWait);
   }
 };
diff --git a/examples/responsiveDemo/backstop_data/engine_scripts/puppet/clickAndHoverHelper.js b/examples/responsiveDemo/backstop_data/engine_scripts/puppet/clickAndHoverHelper.js
index 50ebf4184..7ff027bae 100644
--- a/examples/responsiveDemo/backstop_data/engine_scripts/puppet/clickAndHoverHelper.js
+++ b/examples/responsiveDemo/backstop_data/engine_scripts/puppet/clickAndHoverHelper.js
@@ -6,24 +6,24 @@ module.exports = async (page, scenario) => {
 
   if (hoverSelector) {
     for (const hoverSelectorIndex of [].concat(hoverSelector)) {
-      await page.waitForTimeout(hoverSelectorIndex);
+      await page.waitFor(hoverSelectorIndex);
       await page.hover(hoverSelectorIndex);
     }
   }
 
   if (clickSelector) {
     for (const clickSelectorIndex of [].concat(clickSelector)) {
-      await page.waitForTimeout(clickSelectorIndex);
+      await page.waitFor(clickSelectorIndex);
       await page.click(clickSelectorIndex);
     }
   }
 
   if (postInteractionWait) {
-    await page.waitForTimeout(postInteractionWait);
+    await page.waitFor(postInteractionWait);
   }
 
   if (scrollToSelector) {
-    await page.waitForTimeout(scrollToSelector);
+    await page.waitFor(scrollToSelector);
     await page.evaluate(scrollToSelector => {
       document.querySelector(scrollToSelector).scrollIntoView();
     }, scrollToSelector);
diff --git a/test/configs/backstop_data/engine_scripts/puppet/clickAndHoverHelper.js b/test/configs/backstop_data/engine_scripts/puppet/clickAndHoverHelper.js
index d06ecccac..13a88ee71 100644
--- a/test/configs/backstop_data/engine_scripts/puppet/clickAndHoverHelper.js
+++ b/test/configs/backstop_data/engine_scripts/puppet/clickAndHoverHelper.js
@@ -7,27 +7,27 @@ module.exports = async (page, scenario) => {
 
   if (keyPressSelector) {
     for (const keyPressSelectorItem of [].concat(keyPressSelector)) {
-      await page.waitForTimeout(keyPressSelectorItem.selector);
+      await page.waitFor(keyPressSelectorItem.selector);
       await page.type(keyPressSelectorItem.selector, keyPressSelectorItem.keyPress);
     }
   }
 
   if (hoverSelector) {
-    await page.waitForTimeout(hoverSelector);
+    await page.waitFor(hoverSelector);
     await page.hover(hoverSelector);
   }
 
   if (clickSelector) {
-    await page.waitForTimeout(clickSelector);
+    await page.waitFor(clickSelector);
     await page.click(clickSelector);
   }
 
   if (postInteractionWait) {
-    await page.waitForTimeout(postInteractionWait);
+    await page.waitFor(postInteractionWait);
   }
 
   if (scrollToSelector) {
-    await page.waitForTimeout(scrollToSelector);
+    await page.waitFor(scrollToSelector);
     await page.evaluate(scrollToSelector => {
       document.querySelector(scrollToSelector).scrollIntoView();
     }, scrollToSelector);