diff --git a/esphome/__main__.py b/esphome/__main__.py
index 770c1a8fcf..5784911ccc 100644
--- a/esphome/__main__.py
+++ b/esphome/__main__.py
@@ -919,7 +919,7 @@ def parse_args(argv):
         "--port",
         help="The HTTP port to open connections on. Defaults to 6052.",
         type=int,
-        default=6052,
+        default=os.environ.get("ESPHOME_DASHBOARD_PORT", 6052),
     )
     parser_dashboard.add_argument(
         "--address",
diff --git a/tests/dashboard/test_web_server.py b/tests/dashboard/test_web_server.py
index a61850abf3..224fc4b823 100644
--- a/tests/dashboard/test_web_server.py
+++ b/tests/dashboard/test_web_server.py
@@ -35,14 +35,14 @@ class DashboardTestHelper:
         return result
 
 
-@pytest_asyncio.fixture()
-async def dashboard() -> DashboardTestHelper:
+@pytest_asyncio.fixture(name="dashboard")
+async def fixture_dashboard() -> DashboardTestHelper:
     sock, port = bind_unused_port()
     args = Mock(
         ha_addon=True,
         configuration=get_fixture_path("conf"),
-        port=port,
     )
+    os.environ["ESPHOME_DASHBOARD_PORT"] = str(port)
     DASHBOARD.settings.parse_args(args)
     app = web_server.make_app()
     http_server = HTTPServer(app)