diff --git a/platformio/debug/cli.py b/platformio/debug/cli.py
index 489261c9..01e81f36 100644
--- a/platformio/debug/cli.py
+++ b/platformio/debug/cli.py
@@ -61,7 +61,7 @@ from platformio.project.options import ProjectOptions
 @click.option("--interface", type=click.Choice(["gdb"]))
 @click.argument("__unprocessed", nargs=-1, type=click.UNPROCESSED)
 @click.pass_context
-def debug_cmd(
+def cli(
     ctx,
     project_dir,
     project_conf,
@@ -93,9 +93,6 @@ def debug_cmd(
         )
 
 
-cli = debug_cmd
-
-
 def _debug_in_project_dir(
     ctx,
     project_dir,
diff --git a/platformio/remote/cli.py b/platformio/remote/cli.py
index c761f92e..1a32c549 100644
--- a/platformio/remote/cli.py
+++ b/platformio/remote/cli.py
@@ -34,7 +34,7 @@ from platformio.package.manager.core import inject_contrib_pysite
 from platformio.project.exception import NotPlatformIOProjectError
 from platformio.project.options import ProjectOptions
 from platformio.run.cli import cli as cmd_run
-from platformio.test.cli import test_cmd
+from platformio.test.cli import cli as test_cmd
 
 
 @click.group("remote", short_help="Remote Development")
diff --git a/platformio/test/cli.py b/platformio/test/cli.py
index 25279d7d..bfb14fd6 100644
--- a/platformio/test/cli.py
+++ b/platformio/test/cli.py
@@ -92,7 +92,7 @@ from platformio.test.runners.factory import TestRunnerFactory
     help="Increase verbosity level, maximum is 3 levels (-vvv), see docs for details",
 )
 @click.pass_context
-def test_cmd(  # pylint: disable=too-many-arguments,too-many-locals,redefined-builtin
+def cli(  # pylint: disable=too-many-arguments,too-many-locals,redefined-builtin
     ctx,
     environment,
     ignore,
@@ -175,9 +175,6 @@ def test_cmd(  # pylint: disable=too-many-arguments,too-many-locals,redefined-bu
         raise exception.ReturnErrorCode(1)
 
 
-cli = test_cmd
-
-
 def print_suite_header(test_suite):
     click.echo(
         "Processing %s in %s environment"
diff --git a/tests/commands/test_test.py b/tests/commands/test_test.py
index 343dbd05..2a6c7c56 100644
--- a/tests/commands/test_test.py
+++ b/tests/commands/test_test.py
@@ -21,7 +21,7 @@ import pytest
 
 from platformio import proc
 from platformio.fs import load_json
-from platformio.test.cli import test_cmd as pio_test_cmd
+from platformio.test.cli import cli as pio_test_cmd
 
 
 def test_calculator_example(tmp_path: Path):