diff --git a/wscript b/wscript
index 3d1f369563..0e3a4f3d89 100644
--- a/wscript
+++ b/wscript
@@ -187,9 +187,10 @@ def build(bld):
             bld.fatal('check: gtest library is required')
         bld.add_post_fun(ardupilotwaf.test_summary)
 
-class CheckContext(BuildContext):
-    '''executes tests after build'''
-    cmd = 'check'
+ardupilotwaf.build_shortcut('check',
+    program_group_list='all',
+    doc='builds all programs and run tests',
+)
 
 ardupilotwaf.build_shortcut('copter',
     targets='bin/arducopter',