diff --git a/subunit2sql/shell.py b/subunit2sql/shell.py
index 03fdae7..f5d1439 100644
--- a/subunit2sql/shell.py
+++ b/subunit2sql/shell.py
@@ -47,8 +47,10 @@ _DEFAULT_SQL_CONNECTION = 'sqlite:///' + state_path_def('subunit2sql.sqlite')
 
 
 def parse_args(argv, default_config_files=None):
-    options.set_defaults(CONF, connection=_DEFAULT_SQL_CONNECTION,
-                         sqlite_db='subunit2sql.sqlite')
+    cfg.CONF.register_cli_opts(options.database_opts, group='database')
+    cfg.CONF.set_default('connection', _DEFAULT_SQL_CONNECTION,
+                         group='database')
+    cfg.CONF.set_default('sqlite_db', 'subunit2sql.sqlite', group='database')
     cfg.CONF(argv[1:], project='subunit2sql',
              default_config_files=default_config_files)