diff --git a/mopidy/__main__.py b/mopidy/__main__.py
index aa0c751e..c8af0600 100644
--- a/mopidy/__main__.py
+++ b/mopidy/__main__.py
@@ -30,7 +30,9 @@ def main():
     signal.signal(signal.SIGTERM, process.exit_handler)
     signal.signal(signal.SIGUSR1, pykka.debug.log_thread_tracebacks)
 
-    args = commands.parser.parse_args(args=mopidy_args)
+    parser = commands.build_parser()
+    args = parser.parse_args(args=mopidy_args)
+
     if args.show_config:
         commands.show_config(args)
     if args.show_deps:
diff --git a/mopidy/commands.py b/mopidy/commands.py
index 598be043..0f7e6d9b 100644
--- a/mopidy/commands.py
+++ b/mopidy/commands.py
@@ -21,39 +21,42 @@ def config_override_type(value):
             '%s must have the format section/key=value' % value)
 
 
-parser = argparse.ArgumentParser()
-parser.add_argument(
-    '--version', action='version',
-    version='Mopidy %s' % versioning.get_version())
-parser.add_argument(
-    '-q', '--quiet',
-    action='store_const', const=-1, dest='verbosity_level',
-    help='less output (warning level)')
-parser.add_argument(
-    '-v', '--verbose',
-    action='count', dest='verbosity_level',
-    help='more output (debug level)')
-parser.add_argument(
-    '--save-debug-log',
-    action='store_true', dest='save_debug_log',
-    help='save debug log to "./mopidy.log"')
-parser.add_argument(
-    '--show-config',
-    action='store_true', dest='show_config',
-    help='show current config')
-parser.add_argument(
-    '--show-deps',
-    action='store_true', dest='show_deps',
-    help='show dependencies and their versions')
-parser.add_argument(
-    '--config',
-    action='store', dest='config_files', type=config_files_type,
-    default=b'$XDG_CONFIG_DIR/mopidy/mopidy.conf',
-    help='config files to use, colon seperated, later files override')
-parser.add_argument(
-    '-o', '--option',
-    action='append', dest='config_overrides', type=config_override_type,
-    help='`section/key=value` values to override config options')
+def build_parser():
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        '--version', action='version',
+        version='Mopidy %s' % versioning.get_version())
+    parser.add_argument(
+        '-q', '--quiet',
+        action='store_const', const=-1, dest='verbosity_level',
+        help='less output (warning level)')
+    parser.add_argument(
+        '-v', '--verbose',
+        action='count', dest='verbosity_level',
+        help='more output (debug level)')
+    parser.add_argument(
+        '--save-debug-log',
+        action='store_true', dest='save_debug_log',
+        help='save debug log to "./mopidy.log"')
+    parser.add_argument(
+        '--show-config',
+        action='store_true', dest='show_config',
+        help='show current config')
+    parser.add_argument(
+        '--show-deps',
+        action='store_true', dest='show_deps',
+        help='show dependencies and their versions')
+    parser.add_argument(
+        '--config',
+        action='store', dest='config_files', type=config_files_type,
+        default=b'$XDG_CONFIG_DIR/mopidy/mopidy.conf',
+        help='config files to use, colon seperated, later files override')
+    parser.add_argument(
+        '-o', '--option',
+        action='append', dest='config_overrides', type=config_override_type,
+        help='`section/key=value` values to override config options')
+
+    return parser
 
 
 def show_config(args):