diff --git a/plugin/ale.vim b/plugin/ale.vim
index a07915f7..2f613b53 100644
--- a/plugin/ale.vim
+++ b/plugin/ale.vim
@@ -285,7 +285,7 @@ call ale#toggle#InitAuGroups()
 augroup ALECleanupGroup
     autocmd!
     " Clean up buffers automatically when they are unloaded.
-    autocmd BufUnload * call ale#engine#Cleanup(str2nr(expand('<abuf>')))
+    autocmd BufDelete * call ale#engine#Cleanup(str2nr(expand('<abuf>')))
     autocmd QuitPre * call ale#events#QuitEvent(str2nr(expand('<abuf>')))
 augroup END
 
diff --git a/test/test_autocmd_commands.vader b/test/test_autocmd_commands.vader
index e7e9e86e..c03e8fb7 100644
--- a/test/test_autocmd_commands.vader
+++ b/test/test_autocmd_commands.vader
@@ -191,7 +191,7 @@ Execute (g:ale_echo_cursor = 1 should bind cursor events):
 
 Execute (ALECleanupGroup should include the right commands):
   AssertEqual [
-  \ 'BufUnload * call ale#engine#Cleanup(str2nr(expand(''<abuf>'')))',
+  \ 'BufDelete * call ale#engine#Cleanup(str2nr(expand(''<abuf>'')))',
   \ 'QuitPre * call ale#events#QuitEvent(str2nr(expand(''<abuf>'')))',
   \], CheckAutocmd('ALECleanupGroup')
 
diff --git a/test/test_cleanup.vader b/test/test_cleanup.vader
index 23e5bcf0..232874aa 100644
--- a/test/test_cleanup.vader
+++ b/test/test_cleanup.vader
@@ -1,15 +1,14 @@
-Before:
-    let g:buffer = bufnr('%')
-
-    let g:ale_buffer_info = {
-    \  g:buffer : {'temporary_file_list': [], 'temporary_directory_list': []},
-    \  10347: {'temporary_file_list': [], 'temporary_directory_list': []},
-    \}
-
 After:
-    unlet! g:buffer
-    let g:ale_buffer_info = {}
+  unlet! g:buffer
+  let g:ale_buffer_info = {}
 
-Execute('ALE globals should be cleared when the buffer is closed.'):
-    :q!
-    AssertEqual {10347: {'temporary_file_list': [], 'temporary_directory_list': []}}, g:ale_buffer_info
+Execute('ALE globals should be cleared when the buffer is deleted):
+  new
+
+  let g:ale_buffer_info = {
+  \  bufnr(''): {'temporary_file_list': [], 'temporary_directory_list': []},
+  \  10347: {'temporary_file_list': [], 'temporary_directory_list': []},
+  \}
+
+  bdelete
+  AssertEqual {10347: {'temporary_file_list': [], 'temporary_directory_list': []}}, g:ale_buffer_info