diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergPartitionEvolution.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergPartitionEvolution.java
index 03feb773d123..cef36f670cf0 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergPartitionEvolution.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergPartitionEvolution.java
@@ -113,7 +113,7 @@ public void testAddPartitionColumn()
                 .filter(file -> ((String) file.getField(0)).contains("regionkey="))
                 .collect(toImmutableList());
 
-        expectedInitialFiles = toIntExact((long) computeActual("SELECT DISTINCT substring(name, 1, 1) FROM nation WHERE nationkey < 10").getRowCount());
+        expectedInitialFiles = computeActual("SELECT DISTINCT substring(name, 1, 1) FROM nation WHERE nationkey < 10").getRowCount();
         assertThat(initialFiles).hasSize(expectedInitialFiles);
         assertEquals(initialFiles.stream().mapToLong(row -> (long) row.getField(1)).sum(), 10L);
 
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergPlugin.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergPlugin.java
index f65e02ba0b57..a249f2a72770 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergPlugin.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/TestIcebergPlugin.java
@@ -26,7 +26,6 @@
 
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static io.trino.plugin.hive.HiveConfig.HIVE_VIEWS_ENABLED;
-import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class TestIcebergPlugin
@@ -189,7 +188,7 @@ public void testFileBasedAccessControl()
         ConnectorFactory connectorFactory = getConnectorFactory();
         File tempFile = File.createTempFile("test-iceberg-plugin-access-control", ".json");
         tempFile.deleteOnExit();
-        Files.write(tempFile.toPath(), "{}".getBytes(UTF_8));
+        Files.writeString(tempFile.toPath(), "{}");
 
         connectorFactory.create(
                 "test",
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCreateTableFailure.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCreateTableFailure.java
index e0c8fc6dff82..f68ce2d74703 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCreateTableFailure.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/catalog/glue/TestIcebergGlueCreateTableFailure.java
@@ -33,7 +33,6 @@
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.Test;
 
-import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -119,7 +118,6 @@ protected LocalQueryRunner createQueryRunner()
 
     @AfterClass(alwaysRun = true)
     public void cleanup()
-            throws IOException
     {
         try {
             if (glueHiveMetastore != null) {