diff --git a/platformio/run/cli.py b/platformio/run/cli.py
index c07db5fde4..78d949cd10 100644
--- a/platformio/run/cli.py
+++ b/platformio/run/cli.py
@@ -45,6 +45,7 @@
 @click.option("-t", "--target", multiple=True)
 @click.option("--upload-port")
 @click.option("--monitor-port")
+@click.option("-p", "--port", default=None, help="Shortcut: set both upload-port and monitor-port")
 @click.option(
     "-d",
     "--project-dir",
@@ -84,6 +85,7 @@ def cli(  # pylint: disable=too-many-positional-arguments
     target,
     upload_port,
     monitor_port,
+    port,
     project_dir,
     project_conf,
     jobs,
@@ -93,6 +95,10 @@ def cli(  # pylint: disable=too-many-positional-arguments
     silent,
     verbose,
 ):
+    if port:
+        upload_port = upload_port or port
+        monitor_port = monitor_port or port
+
     app.set_session_var("custom_project_conf", project_conf)
 
     # find project directory on upper level