diff --git a/presto-product-tests-launcher/src/main/java/io/prestosql/tests/product/launcher/env/environment/SinglenodeSparkIceberg.java b/presto-product-tests-launcher/src/main/java/io/prestosql/tests/product/launcher/env/environment/SinglenodeSparkIceberg.java
index 5a36550e5f49a..2e50858543f5e 100644
--- a/presto-product-tests-launcher/src/main/java/io/prestosql/tests/product/launcher/env/environment/SinglenodeSparkIceberg.java
+++ b/presto-product-tests-launcher/src/main/java/io/prestosql/tests/product/launcher/env/environment/SinglenodeSparkIceberg.java
@@ -69,11 +69,8 @@ public void extendEnvironment(Environment.Builder builder)
                         forHostPath(dockerFiles.getDockerFilesHostPath("conf/environment/singlenode-spark-iceberg/iceberg.properties")),
                         CONTAINER_PRESTO_ETC + "/catalog/iceberg.properties"));
 
-        DockerContainer spark = createSpark();
-        // Spark needs the HMS to be up before it starts
-        builder.configureContainer(HADOOP, spark::dependsOn);
-
-        builder.addContainer(spark);
+        builder.addContainer(createSpark())
+                .containerDependsOn("spark", HADOOP);
     }
 
     @SuppressWarnings("resource")