diff --git a/.vscode/settings.json b/.vscode/settings.json
index 38ff0ac1d..a21bc3399 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,7 +3,9 @@
     "python.linting.flake8Enabled": true,
     "python.linting.mypyEnabled": true,
     "python.linting.enabled": true,
-    "python.testing.pytestArgs": [],
+    "python.testing.pytestArgs": [
+        "tests"
+    ],
     "python.testing.unittestEnabled": false,
     "python.testing.pytestEnabled": true,
     "python.formatting.provider": "black",
diff --git a/src/blueapi/cli/cli.py b/src/blueapi/cli/cli.py
index 4a12cc2f2..2254d0b7c 100644
--- a/src/blueapi/cli/cli.py
+++ b/src/blueapi/cli/cli.py
@@ -27,19 +27,16 @@
 
 from .rest import BlueapiRestClient
 
-CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])
-
-
 @click.group(invoke_without_command=True)
 @click.version_option(version=__version__, prog_name="blueapi")
 @click.option(
     "-c", "--config", type=Path, help="Path to configuration YAML file", multiple=True
 )
 @click.pass_context
-@click.command(context_settings=CONTEXT_SETTINGS)
 def main(ctx: click.Context, config: Union[Optional[Path], Tuple[Path, ...]]) -> None:
     # if no command is supplied, run with the options passed
 
+    ctx.help_option_names = ["-h", "--help"]
     config_loader = ConfigLoader(ApplicationConfig)
     if config is not None:
         configs = (config,) if isinstance(config, Path) else config