diff --git a/Tools/ardupilotwaf/ardupilotwaf.py b/Tools/ardupilotwaf/ardupilotwaf.py
index 115528a1ec..69243c3d3d 100644
--- a/Tools/ardupilotwaf/ardupilotwaf.py
+++ b/Tools/ardupilotwaf/ardupilotwaf.py
@@ -346,6 +346,12 @@ def _select_programs_from_group(bld):
             bld.targets += ',' + tg.name
 
 def options(opt):
+    opt.ap_groups = {
+        'configure': opt.add_option_group('Ardupilot configure options'),
+        'build': opt.add_option_group('Ardupilot build options'),
+        'check': opt.add_option_group('Ardupilot check options'),
+    }
+
     g = opt.ap_groups['build']
 
     g.add_option('--program-group',
diff --git a/wscript b/wscript
index 4b03869886..6e8f1671a0 100644
--- a/wscript
+++ b/wscript
@@ -47,13 +47,6 @@ def init(ctx):
 
 def options(opt):
     opt.load('compiler_cxx compiler_c waf_unit_test python')
-
-    opt.ap_groups = {
-        'configure': opt.add_option_group('Ardupilot configure options'),
-        'build': opt.add_option_group('Ardupilot build options'),
-        'check': opt.add_option_group('Ardupilot check options'),
-    }
-
     opt.load('ardupilotwaf')
     opt.load('build_summary')