diff --git a/gcloud-java-pubsub/src/main/java/com/google/cloud/pubsub/testing/LocalPubsubHelper.java b/gcloud-java-pubsub/src/main/java/com/google/cloud/pubsub/testing/LocalPubsubHelper.java
index 88acb46101b1..afdba1c135ed 100644
--- a/gcloud-java-pubsub/src/main/java/com/google/cloud/pubsub/testing/LocalPubsubHelper.java
+++ b/gcloud-java-pubsub/src/main/java/com/google/cloud/pubsub/testing/LocalPubsubHelper.java
@@ -71,7 +71,7 @@ public class LocalPubsubHelper {
   public LocalPubsubHelper() {
     port = LocalServiceHelper.findAvailablePort(DEFAULT_PORT);
     List<String> gcloudCommand = new ArrayList<>(Arrays.asList(GCLOUD_CMD_TEXT.split(" ")));
-    gcloudCommand.add(GCLOUD_CMD_PORT_FLAG + port);
+    gcloudCommand.add(GCLOUD_CMD_PORT_FLAG + "localhost:" + port);
     GCloudEmulatorRunner gcloudRunner =
         new GCloudEmulatorRunner(gcloudCommand, VERSION_PREFIX, MIN_VERSION);
     DownloadableEmulatorRunner downloadRunner =
@@ -89,7 +89,7 @@ public LocalPubsubHelper() {
    * @throws IOException
    */
   public void start() throws IOException, InterruptedException {
-    String blockUntilOutput = Integer.toString(port);
+    String blockUntilOutput = "Server started, listening on " + port;
     serviceHelper.start(blockUntilOutput);
   }