diff --git a/test/completion/test_lsp_completion_messages.vader b/test/completion/test_lsp_completion_messages.vader
index 8ba2ad38..e5aac176 100644
--- a/test/completion/test_lsp_completion_messages.vader
+++ b/test/completion/test_lsp_completion_messages.vader
@@ -59,6 +59,7 @@ After:
 
   runtime autoload/ale/completion.vim
   runtime autoload/ale/lsp.vim
+  runtime autoload/ale/lsp_linter.vim
 
 Given typescript(Some typescript file):
   foo
diff --git a/test/lsp/test_did_save_event.vader b/test/lsp/test_did_save_event.vader
index 97774372..b696ee4b 100644
--- a/test/lsp/test_did_save_event.vader
+++ b/test/lsp/test_did_save_event.vader
@@ -75,6 +75,7 @@ After:
 
   runtime autoload/ale/completion.vim
   runtime autoload/ale/lsp.vim
+  runtime autoload/ale/lsp_linter.vim
 
 Given foobar (Some imaginary filetype):
   <contents>
diff --git a/test/lsp/test_lsp_command_formatting.vader b/test/lsp/test_lsp_command_formatting.vader
index 35c79096..f87f7f4f 100644
--- a/test/lsp/test_lsp_command_formatting.vader
+++ b/test/lsp/test_lsp_command_formatting.vader
@@ -32,6 +32,6 @@ Execute(Command formatting should be applied correctly for LSP linters):
     \ g:args[:2]
   else
     AssertEqual
-    \ ['true', ['/bin/bash', '-c', '''true'' --foo'], '/foo/bar'],
+    \ ['true', [&shell, '-c', '''true'' --foo'], '/foo/bar'],
     \ g:args[:2]
   endif
diff --git a/test/test_find_references.vader b/test/test_find_references.vader
index c2290ca3..150e0471 100644
--- a/test/test_find_references.vader
+++ b/test/test_find_references.vader
@@ -58,7 +58,7 @@ After:
   unlet! g:item_list
   unlet! g:preview_called
 
-  runtime autoload/ale/linter.vim
+  runtime autoload/ale/lsp_linter.vim
   runtime autoload/ale/lsp.vim
   runtime autoload/ale/util.vim
   runtime autoload/ale/preview.vim
diff --git a/test/test_go_to_definition.vader b/test/test_go_to_definition.vader
index 78373a65..749f4d7e 100644
--- a/test/test_go_to_definition.vader
+++ b/test/test_go_to_definition.vader
@@ -48,7 +48,7 @@ After:
   unlet! g:expr_list
   unlet! b:ale_linters
 
-  runtime autoload/ale/linter.vim
+  runtime autoload/ale/lsp_linter.vim
   runtime autoload/ale/lsp.vim
   runtime autoload/ale/util.vim
 
diff --git a/test/test_hover.vader b/test/test_hover.vader
index 15f164f0..a18fc651 100644
--- a/test/test_hover.vader
+++ b/test/test_hover.vader
@@ -61,7 +61,7 @@ After:
 
   delfunction HandleValidLSPResult
 
-  runtime autoload/ale/linter.vim
+  runtime autoload/ale/lsp_linter.vim
   runtime autoload/ale/lsp.vim
   runtime autoload/ale/util.vim