diff --git a/lnt/lnttool/admin.py b/lnt/lnttool/admin.py
index 188a0de8..ceb5554d 100644
--- a/lnt/lnttool/admin.py
+++ b/lnt/lnttool/admin.py
@@ -341,7 +341,7 @@ def action_create_config():
     sys.stderr.write("Created '%s'\n" % _default_config_filename)
 
 
-class AdminCLI(click.MultiCommand):
+class AdminCLI(click.Group):
     '''Admin subcommands. Put into this class so we can lazily import
     dependencies.'''
     _commands = [
diff --git a/lnt/lnttool/main.py b/lnt/lnttool/main.py
index 86db3c04..6c2fdc48 100644
--- a/lnt/lnttool/main.py
+++ b/lnt/lnttool/main.py
@@ -142,7 +142,7 @@ def _print_result_url(results, verbose):
         print("Results available at: no URL available")
 
 
-class RunTestCLI(click.MultiCommand):
+class RunTestCLI(click.Group):
     def list_commands(self, ctx):
         import lnt.tests
         return lnt.tests.get_names()