diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/Coder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/Coder.java
index 0a3650ca133b..6bcdea0c0ab6 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/Coder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/Coder.java
@@ -198,8 +198,7 @@ public static void verifyDeterministic(Coder<?> target, String message, Iterable
     }
   }
 
-  public static <T> long getEncodedElementByteSizeUsingCoder(Coder<T> target, T value)
-      throws Exception {
+  public static <T> long getEncodedElementByteSizeUsingCoder(Coder<T> target, T value) throws Exception {
     return target.getEncodedElementByteSize(value);
   }
   /**
diff --git a/sdks/java/io/rrio/src/test/java/org/apache/beam/io/requestresponse/CallTest.java b/sdks/java/io/rrio/src/test/java/org/apache/beam/io/requestresponse/CallTest.java
index b942e4207aed..b369a62ae78d 100644
--- a/sdks/java/io/rrio/src/test/java/org/apache/beam/io/requestresponse/CallTest.java
+++ b/sdks/java/io/rrio/src/test/java/org/apache/beam/io/requestresponse/CallTest.java
@@ -358,9 +358,7 @@ private static class CallerExceedsTimeout implements Caller<Request, Response> {
     private final Duration timeout;
 
     CallerExceedsTimeout(Duration timeout) {
-      // The timeout testing is flaky so we set a sleep time with a minute padding beyond what
-      // should trigger the timeout.
-      this.timeout = timeout.plus(Duration.standardMinutes(1L));
+      this.timeout = timeout.plus(Duration.standardSeconds(1L));
     }
 
     @Override
@@ -399,9 +397,7 @@ private static class SetupExceedsTimeout implements SetupTeardown {
     private final Duration timeout;
 
     private SetupExceedsTimeout(Duration timeout) {
-      // The timeout testing is flaky so we set a sleep time with a minute padding beyond what
-      // should trigger the timeout.
-      this.timeout = timeout.plus(Duration.standardMinutes(1L));
+      this.timeout = timeout.plus(Duration.standardSeconds(1L));
     }
 
     @Override
@@ -447,9 +443,7 @@ private static class TeardownExceedsTimeout implements SetupTeardown {
     private final Duration timeout;
 
     private TeardownExceedsTimeout(Duration timeout) {
-      // The timeout testing is flaky so we set a sleep time with a minute padding beyond what
-      // should trigger the timeout.
-      this.timeout = timeout.plus(Duration.standardMinutes(1L));
+      this.timeout = timeout.plus(Duration.standardSeconds(1L));
     }
 
     @Override