diff --git a/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestMergeOnReadWithIdentifierFieldsDelete.java b/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestMergeOnReadWithIdentifierFieldsDelete.java
index 95a0a94f5cd3..c37a1ec7a82b 100644
--- a/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestMergeOnReadWithIdentifierFieldsDelete.java
+++ b/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestMergeOnReadWithIdentifierFieldsDelete.java
@@ -18,6 +18,13 @@
  */
 package org.apache.iceberg.spark.extensions;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assumptions.assumeThat;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -49,13 +56,6 @@
 import org.junit.jupiter.api.TestTemplate;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.assertj.core.api.Assumptions.assumeThat;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
 @ExtendWith(ParameterizedTestExtension.class)
 public class TestMergeOnReadWithIdentifierFieldsDelete extends TestDelete {
 
@@ -72,7 +72,9 @@ public void clearTestSparkCatalogCache() {
 
   @TestTemplate
   public void testDeleteWithExecutorCacheLocality() throws NoSuchTableException {
-    sql("CREATE TABLE %s (id INT NOT NULL, dep STRING) USING iceberg PARTITIONED BY (dep)", tableName);
+    sql(
+        "CREATE TABLE %s (id INT NOT NULL, dep STRING) USING iceberg PARTITIONED BY (dep)",
+        tableName);
 
     sql("ALTER TABLE %s SET IDENTIFIER FIELDS id", tableName);
 
diff --git a/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestMergeOnReadWithIdentifierFieldsMerge.java b/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestMergeOnReadWithIdentifierFieldsMerge.java
index 338c4021653b..8cc54d0cb12b 100644
--- a/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestMergeOnReadWithIdentifierFieldsMerge.java
+++ b/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestMergeOnReadWithIdentifierFieldsMerge.java
@@ -18,6 +18,9 @@
  */
 package org.apache.iceberg.spark.extensions;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assumptions.assumeThat;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -37,9 +40,6 @@
 import org.apache.spark.sql.Encoders;
 import org.junit.jupiter.api.TestTemplate;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assumptions.assumeThat;
-
 public class TestMergeOnReadWithIdentifierFieldsMerge extends TestMerge {
 
   @Override
diff --git a/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestMergeOnReadWithIdentifierFieldsUpdate.java b/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestMergeOnReadWithIdentifierFieldsUpdate.java
index 36ba909e0180..e440305de742 100644
--- a/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestMergeOnReadWithIdentifierFieldsUpdate.java
+++ b/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestMergeOnReadWithIdentifierFieldsUpdate.java
@@ -18,6 +18,9 @@
  */
 package org.apache.iceberg.spark.extensions;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assumptions.assumeThat;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -37,9 +40,6 @@
 import org.junit.jupiter.api.TestTemplate;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assumptions.assumeThat;
-
 @ExtendWith(ParameterizedTestExtension.class)
 public class TestMergeOnReadWithIdentifierFieldsUpdate extends TestUpdate {
 
@@ -212,7 +212,8 @@ public void testUpdateWithDVAndHistoricalPositionDeletes() {
   }
 
   private void initTable(String partitionedBy, DeleteGranularity deleteGranularity) {
-    createTableWithDeleteGranularity("id INT NOT NULL, dep STRING", partitionedBy, deleteGranularity);
+    createTableWithDeleteGranularity(
+        "id INT NOT NULL, dep STRING", partitionedBy, deleteGranularity);
 
     sql("ALTER TABLE %s SET IDENTIFIER FIELDS id", tableName);