diff --git a/test/command_callback/test_cpp_clazy_command_callback.vader b/test/command_callback/test_cpp_clazy_command_callback.vader
index f28609ee..1be43b96 100644
--- a/test/command_callback/test_cpp_clazy_command_callback.vader
+++ b/test/command_callback/test_cpp_clazy_command_callback.vader
@@ -1,63 +1,54 @@
 Before:
-  call ale#assert#SetUpLinterTest('cpp', 'clangtidy')
+  call ale#assert#SetUpLinterTest('cpp', 'clazy')
   call ale#test#SetFilename('test.cpp')
 
 After:
   call ale#assert#TearDownLinterTest()
 
-Execute(The clangtidy command default should be correct):
-  AssertLinter 'clang-tidy',
-  \ ale#Escape('clang-tidy') . ' -checks=' . ale#Escape('*') . ' %s'
+Execute(The clazy command default should be correct):
+  AssertLinter 'clazy-standalone',
+  \ ale#Escape('clazy-standalone') . ' -checks=' . ale#Escape('level1') . ' %s'
 
-Execute(You should be able to remove the -checks option for clang-tidy):
-  let b:ale_cpp_clangtidy_checks = []
+Execute(You should be able to remove the -checks option for clazy-standalone):
+  let b:ale_cpp_clazy_checks = []
 
-  AssertLinter 'clang-tidy', ale#Escape('clang-tidy') . ' %s'
+  AssertLinter 'clazy-standalone', ale#Escape('clazy-standalone') . ' %s'
 
-Execute(You should be able to set other checks for clang-tidy):
-  let b:ale_cpp_clangtidy_checks = ['-*', 'clang-analyzer-*']
+Execute(You should be able to set other checks for clazy-standalone):
+  let b:ale_cpp_clazy_checks = ['level2', 'level3']
 
-  AssertLinter 'clang-tidy',
-  \ ale#Escape('clang-tidy')
-  \   . ' -checks=' . ale#Escape('-*,clang-analyzer-*') . ' %s'
+  AssertLinter 'clazy-standalone',
+  \ ale#Escape('clazy-standalone')
+  \   . ' -checks=' . ale#Escape('level2,level3') . ' %s'
 
-Execute(You should be able to manually set compiler flags for clang-tidy):
-  let b:ale_cpp_clangtidy_options = '-Wall'
+Execute(You should be able to manually set compiler flags for clazy-standalone):
+  let b:ale_cpp_clazy_options = '-qt4-compat'
 
-  AssertLinter 'clang-tidy',
-  \ ale#Escape('clang-tidy') . ' -checks=' . ale#Escape('*') . ' %s -- -Wall'
+  AssertLinter 'clazy-standalone',
+  \ ale#Escape('clazy-standalone') . ' -checks=' . ale#Escape('level1') . ' -qt4-compat' . ' %s'
   \
 Execute(The build directory should be configurable):
   let b:ale_c_build_dir = '/foo/bar'
 
-  AssertLinter 'clang-tidy',
-  \ ale#Escape('clang-tidy')
-  \   . ' -checks=' . ale#Escape('*') . ' %s -p ' . ale#Escape('/foo/bar')
-
-Execute(The build directory setting should override the options):
-  let b:ale_c_build_dir = '/foo/bar'
-  let b:ale_cpp_clangtidy_options = '-Wall'
-
-  AssertLinter 'clang-tidy',
-  \ ale#Escape('clang-tidy')
-  \   . ' -checks=' . ale#Escape('*') . ' %s -p ' . ale#Escape('/foo/bar')
+  AssertLinter 'clazy-standalone',
+  \ ale#Escape('clazy-standalone')
+  \   . ' -checks=' . ale#Escape('level1') . ' -p ' . ale#Escape('/foo/bar') . ' %s'
 
 Execute(The build directory should be ignored for header files):
   call ale#test#SetFilename('test.h')
 
   let b:ale_c_build_dir = '/foo/bar'
-  let b:ale_cpp_clangtidy_options = '-Wall'
 
-  AssertLinter 'clang-tidy',
-  \ ale#Escape('clang-tidy') . ' -checks=' . ale#Escape('*') . ' %s -- -Wall'
+  AssertLinter 'clazy-standalone',
+  \ ale#Escape('clazy-standalone') . ' -checks=' . ale#Escape('level1') . ' %s'
 
   call ale#test#SetFilename('test.hpp')
 
-  AssertLinter 'clang-tidy',
-  \ ale#Escape('clang-tidy') . ' -checks=' . ale#Escape('*') . ' %s -- -Wall'
+  AssertLinter 'clazy-standalone',
+  \ ale#Escape('clazy-standalone') . ' -checks=' . ale#Escape('level1') . ' %s'
 
 Execute(The executable should be configurable):
-  let b:ale_cpp_clangtidy_executable = 'foobar'
+  let b:ale_cpp_clazy_executable = 'foobar'
 
   AssertLinter 'foobar',
-  \ ale#Escape('foobar') . ' -checks=' . ale#Escape('*') . ' %s'
+  \ ale#Escape('foobar') . ' -checks=' . ale#Escape('level1') . ' %s'