diff --git a/features/notebooklist.feature b/features/notebooklist.feature
index 7fe8cb4..71027a5 100644
--- a/features/notebooklist.feature
+++ b/features/notebooklist.feature
@@ -55,11 +55,13 @@ Scenario: Delete closes buffers and sessions
   And I clear log expr "ein:log-all-buffer-name"
   And I click on "Delete"
   And I wait for buffer to not say "Untitled"
+  And I dump buffer
   Then eval "(should-not (ein:notebook-opened-notebooks)))"
   Then eval "(should-not (seq-some (lambda (b) (cl-search "Untitled" (buffer-name b))) (buffer-list)))"
   And I switch to log expr "ein:log-all-buffer-name"
-  And I wait for buffer to say "kernel-delete-session--success"
-  And I wait for buffer to say "notebooklist-delete-notebook--complete"
+  And I dump buffer
+  Then I should see "kernel-delete-session--success"
+  Then I should see "notebooklist-delete-notebook--complete"
 
 @content
 Scenario: Read a massive directory
diff --git a/features/support/env.el b/features/support/env.el
index cc808dd..975d827 100644
--- a/features/support/env.el
+++ b/features/support/env.el
@@ -70,7 +70,7 @@
             for path = (ein:$notebook-notebook-path nb)
             do (ein:log 'debug "Notebook %s still open" path)
             finally do (assert nil)))
-  (cl-loop repeat 5
+  (cl-loop repeat 30
            for stragglers = (file-name-all-completions "Untitled"
                                                        ein:testing-jupyter-server-root)
            until (null stragglers)