diff --git a/elasticsearch/license/licensor/src/main/java/org/elasticsearch/license/licensor/tools/LicenseGeneratorTool.java b/elasticsearch/license/licensor/src/main/java/org/elasticsearch/license/licensor/tools/LicenseGeneratorTool.java
index 0064a3a7fa4..7d3ae1f7cca 100644
--- a/elasticsearch/license/licensor/src/main/java/org/elasticsearch/license/licensor/tools/LicenseGeneratorTool.java
+++ b/elasticsearch/license/licensor/src/main/java/org/elasticsearch/license/licensor/tools/LicenseGeneratorTool.java
@@ -107,7 +107,7 @@ public class LicenseGeneratorTool extends CliTool {
             builder.endObject();
             builder.endObject();
             builder.flush();
-            terminal.print(builder.string());
+            terminal.println(builder.string());
 
             return ExitStatus.OK;
         }
diff --git a/elasticsearch/license/licensor/src/main/java/org/elasticsearch/license/licensor/tools/LicenseVerificationTool.java b/elasticsearch/license/licensor/src/main/java/org/elasticsearch/license/licensor/tools/LicenseVerificationTool.java
index 58666e02bd8..1c7a24b824d 100644
--- a/elasticsearch/license/licensor/src/main/java/org/elasticsearch/license/licensor/tools/LicenseVerificationTool.java
+++ b/elasticsearch/license/licensor/src/main/java/org/elasticsearch/license/licensor/tools/LicenseVerificationTool.java
@@ -100,7 +100,7 @@ public class LicenseVerificationTool extends CliTool {
             builder.endObject();
             builder.endObject();
             builder.flush();
-            terminal.print(builder.string());
+            terminal.println(builder.string());
             return ExitStatus.OK;
         }
     }
diff --git a/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/authc/esusers/tool/ESUsersTool.java b/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/authc/esusers/tool/ESUsersTool.java
index ceb0567dadd..2a5af18a418 100644
--- a/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/authc/esusers/tool/ESUsersTool.java
+++ b/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/authc/esusers/tool/ESUsersTool.java
@@ -463,7 +463,7 @@ public class ESUsersTool extends CliTool {
                     if (!unknownRoles.isEmpty()) {
                         // at least one role is marked... so printing the legend
                         Path rolesFile = FileRolesStore.resolveFile(esusersSettings, env).toAbsolutePath();
-                        terminal.println();
+                        terminal.println("");
                         terminal.println(String.format(Locale.ROOT, " [*]   An unknown role. Please check [%s] to see available roles", rolesFile.toAbsolutePath()));
                     }
                 } else {
@@ -496,7 +496,7 @@ public class ESUsersTool extends CliTool {
                 if (unknownRolesFound) {
                     // at least one role is marked... so printing the legend
                     Path rolesFile = FileRolesStore.resolveFile(esusersSettings, env).toAbsolutePath();
-                    terminal.println();
+                    terminal.println("");
                     terminal.println(String.format(Locale.ROOT, " [*]   An unknown role. Please check [%s] to see available roles", rolesFile.toAbsolutePath()));
                 }
             }
diff --git a/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/crypto/tool/SystemKeyTool.java b/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/crypto/tool/SystemKeyTool.java
index 39ae9cdc9e2..2834b087694 100644
--- a/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/crypto/tool/SystemKeyTool.java
+++ b/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/crypto/tool/SystemKeyTool.java
@@ -101,7 +101,7 @@ public class SystemKeyTool extends CliTool {
                 terminal.println(String.format(Locale.ROOT, "Storing generated key in [%s]...", path.toAbsolutePath()));
                 Files.write(path, key, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
             } catch (IOException ioe) {
-                terminal.printError(String.format(Locale.ROOT, "Cannot generate and save system key file [%s]", path.toAbsolutePath()));
+                terminal.println(Terminal.Verbosity.SILENT, String.format(Locale.ROOT, "ERROR: Cannot generate and save system key file [%s]", path.toAbsolutePath()));
                 return ExitStatus.IO_ERROR;
             }
 
@@ -110,7 +110,7 @@ public class SystemKeyTool extends CliTool {
                 try {
                     Files.setPosixFilePermissions(path, PERMISSION_OWNER_READ_WRITE);
                 } catch (IOException ioe) {
-                    terminal.printError(String.format(Locale.ROOT, "Cannot set owner read/write permissions to generated system key file [%s]", path.toAbsolutePath()));
+                    terminal.println(Terminal.Verbosity.SILENT, String.format(Locale.ROOT, "ERROR: Cannot set owner read/write permissions to generated system key file [%s]", path.toAbsolutePath()));
                     return ExitStatus.IO_ERROR;
                 }
                 terminal.println("Ensure the generated key can be read by the user that Elasticsearch runs as, permissions are set to owner read/write only");
diff --git a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/authc/esusers/tool/ESUsersToolTests.java b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/authc/esusers/tool/ESUsersToolTests.java
index 719164c7535..6d36b38dcf9 100644
--- a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/authc/esusers/tool/ESUsersToolTests.java
+++ b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/authc/esusers/tool/ESUsersToolTests.java
@@ -97,7 +97,7 @@ public class ESUsersToolTests extends CliToolTestCase {
     public void testUseraddParseNoPassword() throws Exception {
         ESUsersTool tool = new ESUsersTool(new MockTerminal() {
             @Override
-            public char[] readSecret(String text, Object... args) {
+            public char[] readSecret(String text) {
                 return "changeme".toCharArray();
             }
         });
@@ -391,7 +391,7 @@ public class ESUsersToolTests extends CliToolTestCase {
         final AtomicReference<Boolean> secretRequested = new AtomicReference<>(false);
         Terminal terminal = new MockTerminal() {
             @Override
-            public char[] readSecret(String text, Object... args) {
+            public char[] readSecret(String text) {
                 secretRequested.set(true);
                 return "changeme".toCharArray();
             }
diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/tool/CronEvalTool.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/tool/CronEvalTool.java
index ef2b7a9129b..5750222c0e9 100644
--- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/tool/CronEvalTool.java
+++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/trigger/schedule/tool/CronEvalTool.java
@@ -101,7 +101,7 @@ public class CronEvalTool extends CliTool {
                 long prevTime = time;
                 time = cron.getNextValidTimeAfter(time);
                 if (time < 0) {
-                    terminal.printError((i + 1) + ".\t Could not compute future times since [" + formatter.print(prevTime) + "] " +
+                    terminal.println(Terminal.Verbosity.SILENT, "ERROR: " + (i + 1) + ".\t Could not compute future times since [" + formatter.print(prevTime) + "] " +
                             "(perhaps the cron expression only points to times in the past?)");
                     return ExitStatus.OK;
                 }