diff --git a/src/scenarios.ts b/src/scenarios.ts
index 48d8fd3..72d8d66 100644
--- a/src/scenarios.ts
+++ b/src/scenarios.ts
@@ -249,7 +249,7 @@ export class CompleterScenario
         this.editor!.querySelector('.CodeMirror-scroll')! ||
         this.editor!.querySelector('.cm-scroller')!;
       scrollArea.scrollBy({
-        top: 500,
+        top: 20 * this.options.setup.tokenCount,
         left: 0,
         behavior: 'smooth'
       });
@@ -280,8 +280,12 @@ export class CompleterScenario
     // need to query for a completer with programatically set styles (which are
     // things like position (top/left/width/height) which are only present in the
     // active completer
-    await page.waitForSelector('.jp-Completer[style]', { state: 'attached' });
-    await page.waitForSelector('.jp-Completer[style]', { state: 'visible' });
+    await page.waitForSelector('.jp-Completer.jp-HoverBox[style]', {
+      state: 'attached'
+    });
+    await page.waitForSelector('.jp-Completer.jp-HoverBox[style]', {
+      state: 'visible'
+    });
     await layoutReady();
   }