diff --git a/java/src/org/openqa/selenium/grid/log/TerseFormatter.java b/java/src/org/openqa/selenium/grid/log/TerseFormatter.java
index 3cf94917b7d3f..b672c650f687d 100644
--- a/java/src/org/openqa/selenium/grid/log/TerseFormatter.java
+++ b/java/src/org/openqa/selenium/grid/log/TerseFormatter.java
@@ -41,7 +41,7 @@ public class TerseFormatter extends Formatter {
    * Line separator string. This is the value of the line.separator property at the moment that the
    * TerseFormatter was created.
    */
-  private final String lineSeparator = System.getProperty("line.separator");
+  private final String lineSeparator = System.lineSeparator();
 
   /*
    * DGF - These have to be compile time constants to be used with switch
@@ -78,7 +78,12 @@ public synchronized String format(final LogRecord record) {
     buffer.append(' ');
     buffer.append(levelNumberToCommonsLevelName(record.getLevel()));
     String[] parts = record.getSourceClassName().split("\\.");
-    buffer.append(" [" + parts[parts.length - 1] + "." + record.getSourceMethodName() + "]");
+    buffer
+        .append(" [")
+        .append(parts[parts.length - 1])
+        .append(".")
+        .append(record.getSourceMethodName())
+        .append("]");
     buffer.append(SUFFIX);
     buffer.append(formatMessage(record)).append(lineSeparator);
     if (record.getThrown() != null) {
diff --git a/java/test/org/openqa/selenium/testing/CaptureLoggingRule.java b/java/test/org/openqa/selenium/testing/CaptureLoggingRule.java
index 1ecc33e49a572..5e84b55cfd7d8 100644
--- a/java/test/org/openqa/selenium/testing/CaptureLoggingRule.java
+++ b/java/test/org/openqa/selenium/testing/CaptureLoggingRule.java
@@ -135,7 +135,7 @@ public String format(LogRecord record) {
             .append("]");
       }
       buffer.append(" - ");
-      buffer.append(formatMessage(record)).append(System.getProperty("line.separator"));
+      buffer.append(formatMessage(record)).append(System.lineSeparator());
       if (record.getThrown() != null) {
         final StringWriter trace = new StringWriter();
         record.getThrown().printStackTrace(new PrintWriter(trace));