diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/EnvironmentUp.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/EnvironmentUp.java
index 4d9d3775ff48..79a2db5c6108 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/EnvironmentUp.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/cli/EnvironmentUp.java
@@ -109,7 +109,7 @@ public static class Execution
             implements Callable<Integer>
     {
         private final EnvironmentFactory environmentFactory;
-        private final boolean withoutTrinoMaster;
+        private final boolean withoutCoordinator;
         private final boolean background;
         private final String environment;
         private final EnvironmentConfig environmentConfig;
@@ -122,7 +122,7 @@ public Execution(EnvironmentFactory environmentFactory, EnvironmentConfig enviro
         {
             this.environmentFactory = requireNonNull(environmentFactory, "environmentFactory is null");
             this.environmentConfig = requireNonNull(environmentConfig, "environmentConfig is null");
-            this.withoutTrinoMaster = options.withoutTrinoMaster;
+            this.withoutCoordinator = options.withoutCoordinator;
             this.background = environmentUpOptions.background;
             this.environment = environmentUpOptions.environment;
             this.outputMode = requireNonNull(options.output, "options.output is null");
@@ -139,7 +139,7 @@ public Integer call()
                     .setLogsBaseDir(environmentLogPath)
                     .removeContainer(TESTS);
 
-            if (withoutTrinoMaster) {
+            if (withoutCoordinator) {
                 builder.removeContainers(container -> isTrinoContainer(container.getLogicalName()));
             }
 
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentOptions.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentOptions.java
index f9aa2b680578..6192df32aa6e 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentOptions.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentOptions.java
@@ -39,8 +39,8 @@ public final class EnvironmentOptions
     @Option(names = "--server-package", paramLabel = "<package>", description = "Path to Trino server package " + DEFAULT_VALUE, defaultValue = "${server.module}/target/${server.name}-${project.version}.tar.gz")
     public File serverPackage;
 
-    @Option(names = "--without-trino", description = "Do not start " + COORDINATOR)
-    public boolean withoutTrinoMaster;
+    @Option(names = {"--without-trino", "--no-coordinator"}, description = "Do not start " + COORDINATOR)
+    public boolean withoutCoordinator;
 
     public boolean bindPorts = true;
     int bindPortsBase;
diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Standard.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Standard.java
index 6a00a516adaf..d8b07aedba75 100644
--- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Standard.java
+++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Standard.java
@@ -105,7 +105,7 @@ public Standard(
     @Override
     public void extendEnvironment(Environment.Builder builder)
     {
-        builder.addContainers(createTrinoMaster(), createTestsContainer());
+        builder.addContainers(createTrinoCoordinator(), createTestsContainer());
         // default catalogs copied from /docker/presto-product-tests
         builder.addConnector("blackhole");
         builder.addConnector("jmx");
@@ -114,7 +114,7 @@ public void extendEnvironment(Environment.Builder builder)
     }
 
     @SuppressWarnings("resource")
-    private DockerContainer createTrinoMaster()
+    private DockerContainer createTrinoCoordinator()
     {
         DockerContainer container =
                 createTrinoContainer(dockerFiles, serverPackage, jdkVersion, debug, "ghcr.io/trinodb/testing/centos7-oj17:" + imagesVersion, COORDINATOR)