diff --git a/config/checkstyle/appium-style.xml b/config/checkstyle/appium-style.xml
index 630949b66..b7473e937 100755
--- a/config/checkstyle/appium-style.xml
+++ b/config/checkstyle/appium-style.xml
@@ -63,6 +63,7 @@
              <message key="ws.notPreceded"
              value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
         </module>
+        <module name="SingleSpaceSeparator"/>
         <module name="OneStatementPerLine"/>
         <module name="MultipleVariableDeclarations"/>
         <module name="ArrayTypeStyle"/>
diff --git a/src/main/java/io/appium/java_client/android/AndroidMobileCommandHelper.java b/src/main/java/io/appium/java_client/android/AndroidMobileCommandHelper.java
index 50a7256a5..8c294c4c0 100644
--- a/src/main/java/io/appium/java_client/android/AndroidMobileCommandHelper.java
+++ b/src/main/java/io/appium/java_client/android/AndroidMobileCommandHelper.java
@@ -91,7 +91,7 @@ public class AndroidMobileCommandHelper extends MobileCommand {
         return Map.entry(GET_PERFORMANCE_DATA, Map.of(
                 "packageName", packageName,
                 "dataType", dataType,
-                "dataReadTimeout",  dataReadTimeout
+                "dataReadTimeout", dataReadTimeout
         ));
     }
 
@@ -201,7 +201,7 @@ public class AndroidMobileCommandHelper extends MobileCommand {
      * @return a key-value pair. The key is the command name. The value is a {@link Map} command arguments.
      */
     @Deprecated
-    public static Map.Entry<String, Map<String, ?>>  replaceElementValueCommand(
+    public static Map.Entry<String, Map<String, ?>> replaceElementValueCommand(
         RemoteWebElement remoteWebElement, String value) {
         return Map.entry(REPLACE_VALUE, Map.of(
                 "id", remoteWebElement.getId(),
@@ -241,7 +241,7 @@ public class AndroidMobileCommandHelper extends MobileCommand {
             String phoneNumber, GsmCallActions gsmCallActions) {
         return Map.entry(GSM_CALL, Map.of(
                 "phoneNumber", phoneNumber,
-                "action",  gsmCallActions.name().toLowerCase()
+                "action", gsmCallActions.name().toLowerCase()
         ));
     }
 
diff --git a/src/main/java/io/appium/java_client/android/SupportsSpecialEmulatorCommands.java b/src/main/java/io/appium/java_client/android/SupportsSpecialEmulatorCommands.java
index c7b9accaf..c60d8eaf9 100644
--- a/src/main/java/io/appium/java_client/android/SupportsSpecialEmulatorCommands.java
+++ b/src/main/java/io/appium/java_client/android/SupportsSpecialEmulatorCommands.java
@@ -34,7 +34,7 @@ default void sendSMS(String phoneNumber, String message) {
             // TODO: Remove the fallback
             CommandExecutionHelper.execute(
                     markExtensionAbsence(extName),
-                    Map.entry(SEND_SMS,  Map.of(
+                    Map.entry(SEND_SMS, Map.of(
                             "phoneNumber", phoneNumber,
                             "message", message
                     ))
diff --git a/src/main/java/io/appium/java_client/android/connection/HasNetworkConnection.java b/src/main/java/io/appium/java_client/android/connection/HasNetworkConnection.java
index 03d1381f0..a00693af3 100644
--- a/src/main/java/io/appium/java_client/android/connection/HasNetworkConnection.java
+++ b/src/main/java/io/appium/java_client/android/connection/HasNetworkConnection.java
@@ -71,7 +71,7 @@ default ConnectionState getConnection() {
             return new ConnectionState(
                     ((boolean) result.get("wifi") ? ConnectionState.WIFI_MASK : 0)
                     | ((boolean) result.get("data") ? ConnectionState.DATA_MASK : 0)
-                    | ((boolean) result.get("airplaneMode") ? ConnectionState.AIRPLANE_MODE_MASK  : 0)
+                    | ((boolean) result.get("airplaneMode") ? ConnectionState.AIRPLANE_MODE_MASK : 0)
             );
         } catch (UnsupportedCommandException e) {
             // TODO: Remove the fallback
diff --git a/src/main/java/io/appium/java_client/functions/AppiumFunction.java b/src/main/java/io/appium/java_client/functions/AppiumFunction.java
index de9069d37..cd621a803 100644
--- a/src/main/java/io/appium/java_client/functions/AppiumFunction.java
+++ b/src/main/java/io/appium/java_client/functions/AppiumFunction.java
@@ -30,7 +30,7 @@
  * @param <T> The return type
  */
 @FunctionalInterface
-public interface AppiumFunction<F, T>  extends Function<F, T>, java.util.function.Function<F, T> {
+public interface AppiumFunction<F, T> extends Function<F, T>, java.util.function.Function<F, T> {
 
     @Override default <V> AppiumFunction<V, T> compose(java.util.function.Function<? super V, ? extends F> before) {
         Objects.requireNonNull(before);
diff --git a/src/main/java/io/appium/java_client/ios/options/other/SupportsCommandTimeoutsOption.java b/src/main/java/io/appium/java_client/ios/options/other/SupportsCommandTimeoutsOption.java
index 4461985c1..d19e6272f 100644
--- a/src/main/java/io/appium/java_client/ios/options/other/SupportsCommandTimeoutsOption.java
+++ b/src/main/java/io/appium/java_client/ios/options/other/SupportsCommandTimeoutsOption.java
@@ -62,7 +62,7 @@ default T setCommandTimeouts(Duration timeout) {
     default Optional<Either<CommandTimeouts, Duration>> getCommandTimeouts() {
         return Optional.ofNullable(getCapability(COMMAND_TIMEOUTS_OPTION))
                 .map(String::valueOf)
-                .map(v ->  v.trim().startsWith("{")
+                .map(v -> v.trim().startsWith("{")
                         ? Either.left(new CommandTimeouts(v))
                         : Either.right(toDuration(v))
                 );
diff --git a/src/main/java/io/appium/java_client/serverevents/ServerEvents.java b/src/main/java/io/appium/java_client/serverevents/ServerEvents.java
index 283aa3b66..624dd1707 100644
--- a/src/main/java/io/appium/java_client/serverevents/ServerEvents.java
+++ b/src/main/java/io/appium/java_client/serverevents/ServerEvents.java
@@ -14,7 +14,7 @@ public class ServerEvents {
     public final List<TimedEvent> events;
     public final String jsonData;
 
-    public void save(Path output) throws IOException  {
+    public void save(Path output) throws IOException {
         Files.write(output, this.jsonData.getBytes());
     }
 }
\ No newline at end of file
diff --git a/src/test/java/io/appium/java_client/android/AndroidSearchingTest.java b/src/test/java/io/appium/java_client/android/AndroidSearchingTest.java
index 64390962d..fb9275943 100644
--- a/src/test/java/io/appium/java_client/android/AndroidSearchingTest.java
+++ b/src/test/java/io/appium/java_client/android/AndroidSearchingTest.java
@@ -33,12 +33,12 @@ public void setup() {
         startActivity(".ApiDemos");
     }
 
-    @Test  public void findByAccessibilityIdTest() {
+    @Test public void findByAccessibilityIdTest() {
         assertNotEquals(driver.findElement(AppiumBy.accessibilityId("Graphics")).getText(), null);
         assertEquals(driver.findElements(AppiumBy.accessibilityId("Graphics")).size(), 1);
     }
 
-    @Test  public void findByAndroidUIAutomatorTest() {
+    @Test public void findByAndroidUIAutomatorTest() {
         assertNotEquals(driver
                 .findElement(AppiumBy
                 .androidUIAutomator("new UiSelector().clickable(true)")).getText(), null);
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/TimeoutTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/TimeoutTest.java
index 1ae9157a3..a9d44562d 100644
--- a/src/test/java/io/appium/java_client/pagefactory_tests/TimeoutTest.java
+++ b/src/test/java/io/appium/java_client/pagefactory_tests/TimeoutTest.java
@@ -69,7 +69,7 @@ private static long getPerformanceDiff(long expectedMs, Runnable runnable) {
         long startMark = currentTimeMillis();
         runnable.run();
         long endMark = currentTimeMillis();
-        return abs(expectedMs  - (endMark - startMark));
+        return abs(expectedMs - (endMark - startMark));
     }
 
     private static String assertionMessage(Duration expectedDuration) {