diff --git a/mopidy/__main__.py b/mopidy/__main__.py
index 201c8826..a765548d 100644
--- a/mopidy/__main__.py
+++ b/mopidy/__main__.py
@@ -33,26 +33,12 @@ def main():
     signal.signal(signal.SIGTERM, process.exit_handler)
     signal.signal(signal.SIGUSR1, pykka.debug.log_thread_tracebacks)
 
-    parser = commands.build_parser()
-    subparser = parser.add_subparsers(title='commands', metavar='COMMAND')
-
-    run_parser = subparser.add_parser('run', help='start mopidy server')
-    run_parser.set_defaults(command='run')
-    config_parser = subparser.add_parser('config', help='show current config')
-    config_parser.set_defaults(command='config')
-    deps_parser = subparser.add_parser('deps', help='show dependencies')
-    deps_parser.set_defaults(command='deps')
-
-    bootstrap_args = parser.parse_known_args(args=mopidy_args)[0]
-
-    if bootstrap_args.command in ('config', 'deps'):
-        bootstrap_args.verbosity_level -= 1
-    bootstrap_logging(bootstrap_args)
-
     try:
         create_file_structures()
         check_old_locations()
 
+        parser, subparser = commands.build_parser()
+
         installed_extensions = ext.load_extensions()
         # TODO: install extension subcommands.
 
diff --git a/mopidy/commands.py b/mopidy/commands.py
index 480e0f04..9d65549e 100644
--- a/mopidy/commands.py
+++ b/mopidy/commands.py
@@ -47,4 +47,11 @@ def build_parser():
         action='append', dest='config_overrides', type=config_override_type,
         help='`section/key=value` values to override config options')
 
-    return parser
+    subparser = parser.add_subparsers(
+        title='commands', metavar='COMMAND', dest='command')
+
+    subparser.add_parser('run', help='start mopidy server')
+    subparser.add_parser('config', help='show current config')
+    subparser.add_parser('deps', help='show dependencies')
+
+    return parser, subparser