diff --git a/core/trino-main/src/test/java/io/trino/spiller/TestFileSingleStreamSpillerFactory.java b/core/trino-main/src/test/java/io/trino/spiller/TestFileSingleStreamSpillerFactory.java
index c53d8bfcf75d..1d4d283bf0e2 100644
--- a/core/trino-main/src/test/java/io/trino/spiller/TestFileSingleStreamSpillerFactory.java
+++ b/core/trino-main/src/test/java/io/trino/spiller/TestFileSingleStreamSpillerFactory.java
@@ -218,7 +218,7 @@ public void testCacheInvalidatedOnBadDisk()
         // Set second spiller path to read-only after initialization to emulate a disk failing during runtime
         setPosixFilePermissions(spillPath2.toPath(), ImmutableSet.of(PosixFilePermission.OWNER_READ));
 
-        assertThatThrownBy(() -> { getUnchecked(singleStreamSpiller2.spill(page)); })
+        assertThatThrownBy(() -> getUnchecked(singleStreamSpiller2.spill(page)))
                 .isInstanceOf(com.google.common.util.concurrent.UncheckedExecutionException.class)
                 .hasMessageContaining("Failed to spill pages");
         spillers.add(singleStreamSpiller2);
diff --git a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/BasePushdownPlanTest.java b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/BasePushdownPlanTest.java
index 325b4a5d2631..9ba223af6a66 100644
--- a/core/trino-main/src/test/java/io/trino/sql/planner/assertions/BasePushdownPlanTest.java
+++ b/core/trino-main/src/test/java/io/trino/sql/planner/assertions/BasePushdownPlanTest.java
@@ -29,7 +29,7 @@ public abstract class BasePushdownPlanTest
 {
     protected Optional<TableHandle> getTableHandle(Session session, QualifiedObjectName objectName)
     {
-        return getQueryRunner().inTransaction(session, transactionSession -> { return getQueryRunner().getMetadata().getTableHandle(transactionSession, objectName); });
+        return getQueryRunner().inTransaction(session, transactionSession -> getQueryRunner().getMetadata().getTableHandle(transactionSession, objectName));
     }
 
     protected Map<String, ColumnHandle> getColumnHandles(Session session, QualifiedObjectName tableName)
diff --git a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcTableProperties.java b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcTableProperties.java
index 8c69032467c7..8dc5ab420eaf 100644
--- a/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcTableProperties.java
+++ b/plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/TestJdbcTableProperties.java
@@ -56,7 +56,7 @@ public Map<String, Object> getTableProperties(ConnectorSession session, JdbcTabl
     @Test
     public void testGetTablePropertiesIsNotCalledForSelect()
     {
-        onGetTableProperties = () -> { fail("Unexpected call of: getTableProperties"); };
+        onGetTableProperties = () -> fail("Unexpected call of: getTableProperties");
         assertUpdate("CREATE TABLE copy_of_nation AS SELECT * FROM nation", 25);
         assertQuerySucceeds("SELECT * FROM copy_of_nation");
         assertQuerySucceeds("SELECT nationkey FROM copy_of_nation");
@@ -66,7 +66,7 @@ public void testGetTablePropertiesIsNotCalledForSelect()
     public void testGetTablePropertiesIsCalled()
     {
         AtomicInteger counter = new AtomicInteger();
-        onGetTableProperties = () -> { counter.incrementAndGet(); };
+        onGetTableProperties = () -> counter.incrementAndGet();
         assertQuerySucceeds("SHOW CREATE TABLE nation");
         assertThat(counter.get()).isOne();
     }
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergOrcMetricsCollection.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergOrcMetricsCollection.java
index fd003829577a..03f440472ac5 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergOrcMetricsCollection.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergOrcMetricsCollection.java
@@ -180,10 +180,8 @@ public void testMetrics()
         assertThat(datafile.getRecordCount()).isEqualTo(1);
         assertThat(datafile.getValueCounts().size()).isEqualTo(1);
         assertThat(datafile.getNullValueCounts().size()).isEqualTo(1);
-        datafile.getUpperBounds().forEach((k, v) -> {
-            assertThat(v.length()).isEqualTo(10); });
-        datafile.getLowerBounds().forEach((k, v) -> {
-            assertThat(v.length()).isEqualTo(10); });
+        datafile.getUpperBounds().forEach((k, v) -> assertThat(v.length()).isEqualTo(10));
+        datafile.getLowerBounds().forEach((k, v) -> assertThat(v.length()).isEqualTo(10));
 
         // keep both c1 and c2 metrics
         assertUpdate("create table c_metrics (c1 varchar, c2 varchar)");