diff --git a/test/command_callback/test_tslint_command_callback.vader b/test/command_callback/test_tslint_command_callback.vader
index 51567951..4ad42fa5 100644
--- a/test/command_callback/test_tslint_command_callback.vader
+++ b/test/command_callback/test_tslint_command_callback.vader
@@ -12,6 +12,7 @@ Before:
   runtime ale_linters/typescript/tslint.vim
 
   call ale#test#SetDirectory('/testplugin/test/command_callback')
+  call ale#test#SetFilename('test.ts')
 
 After:
   Restore
@@ -23,7 +24,7 @@ After:
 
 Execute(The default tslint command should be correct):
   AssertEqual
-  \ 'cd ''' . expand('%:p:h') . ''' && '
+  \ 'cd ' . ale#Escape(expand('%:p:h')) . ' && '
   \   . 'tslint --format json %t',
   \ ale_linters#typescript#tslint#GetCommand(bufnr(''))
 
@@ -31,7 +32,7 @@ Execute(The rules directory option should be included if set):
   let b:ale_typescript_tslint_rules_dir = '/foo/bar'
 
   AssertEqual
-  \ 'cd ''' . expand('%:p:h') . ''' && '
+  \ 'cd ' . ale#Escape(expand('%:p:h')) . ' && '
   \   . 'tslint --format json'
   \   . ' -r ' . ale#Escape('/foo/bar')
   \   . ' %t',
diff --git a/test/command_callback/test_xmllint_command_callback.vader b/test/command_callback/test_xmllint_command_callback.vader
index 7c0b1963..3cffde88 100644
--- a/test/command_callback/test_xmllint_command_callback.vader
+++ b/test/command_callback/test_xmllint_command_callback.vader
@@ -7,19 +7,19 @@ After:
   let g:ale_xml_xmllint_executable = 'xmllint'
 
 Execute(The xml xmllint command callback should return the correct default string):
-  AssertEqual '''xmllint'' --noout -',
+  AssertEqual ale#Escape('xmllint') . ' --noout -',
   \ join(split(ale_linters#xml#xmllint#GetCommand(1)))
 
 Execute(The xml xmllint command callback should let you set options):
   let g:ale_xml_xmllint_options = '--xinclude --postvalid'
 
-  AssertEqual '''xmllint'' --xinclude --postvalid --noout -',
+  AssertEqual ale#Escape('xmllint') . ' --xinclude --postvalid --noout -',
   \ join(split(ale_linters#xml#xmllint#GetCommand(1)))
 
 Execute(The xmllint executable should be configurable):
   let g:ale_xml_xmllint_executable = '~/.local/bin/xmllint'
 
   AssertEqual '~/.local/bin/xmllint', ale_linters#xml#xmllint#GetExecutable(1)
-  AssertEqual '''~/.local/bin/xmllint'' --noout -',
+  AssertEqual ale#Escape('~/.local/bin/xmllint') . ' --noout -',
   \ join(split(ale_linters#xml#xmllint#GetCommand(1)))