diff --git a/spec/altbuf_spec.lua b/spec/altbuf_spec.lua
index b64bfc0..cd2cf4b 100644
--- a/spec/altbuf_spec.lua
+++ b/spec/altbuf_spec.lua
@@ -22,7 +22,6 @@ describe('Alternate buffer', function()
     local readme = fs.join(vim.fn.getcwd(), 'README.md')
     vim.cmd.edit({ args = { 'oil://' .. fs.os_to_posix_path(readme) } })
     test_util.wait_for_autocmd('BufEnter')
-    test_util.wait_for_autocmd('BufEnter')
     assert.equals(readme, vim.api.nvim_buf_get_name(0))
     assert.equals('foo', vim.fn.expand('#'))
   end)
diff --git a/spec/test_util.lua b/spec/test_util.lua
index b77f6f1..57f81b1 100644
--- a/spec/test_util.lua
+++ b/spec/test_util.lua
@@ -12,12 +12,8 @@ M.reset_editor = function()
     prompt_save_on_select_new_entry = false,
   })
   vim.cmd.tabonly({ mods = { silent = true } })
-  for i, winid in ipairs(vim.api.nvim_tabpage_list_wins(0)) do
-    if i > 1 then
-      vim.api.nvim_win_close(winid, true)
-    end
-  end
-  vim.api.nvim_win_set_buf(0, vim.api.nvim_create_buf(false, true))
+  vim.cmd.new()
+  vim.cmd.only()
   for _, bufnr in ipairs(vim.api.nvim_list_bufs()) do
     vim.api.nvim_buf_delete(bufnr, { force = true })
   end