diff --git a/wscript b/wscript
index ee84dae28e..198286eb40 100644
--- a/wscript
+++ b/wscript
@@ -123,6 +123,10 @@ def build(bld):
     bld.load('ardupilotwaf')
     bld.load('gtest')
 
+    if bld.cmd == 'check-all':
+        bld.options.all_tests = True
+        bld.cmd = 'check'
+
     #generate mavlink headers
     bld(
         features='mavgen',
@@ -191,6 +195,10 @@ ardupilotwaf.build_command('check',
     program_group_list='all',
     doc='builds all programs and run tests',
 )
+ardupilotwaf.build_command('check-all',
+    program_group_list='all',
+    doc='shortcut for `waf check --alltests`',
+)
 
 ardupilotwaf.build_command('copter',
     targets='bin/arducopter',