diff --git a/hadoop-tools/hadoop-azure/src/config/checkstyle-suppressions.xml b/hadoop-tools/hadoop-azure/src/config/checkstyle-suppressions.xml
index 07aa26d238127..cce1ad793e575 100644
--- a/hadoop-tools/hadoop-azure/src/config/checkstyle-suppressions.xml
+++ b/hadoop-tools/hadoop-azure/src/config/checkstyle-suppressions.xml
@@ -61,4 +61,8 @@
               files="org[\\/]apache[\\/]hadoop[\\/]fs[\\/]azurebfs[\\/]commit[\\/]ITestAbfsTerasort.java"/>
      <suppress checks="ParameterNumber"
        files="org[\\/]apache[\\/]hadoop[\\/]fs[\\/]azurebfs[\\/]services[\\/]TestAbfsOutputStream.java"/>
+    <suppress checks="MagicNumber"
+              files="org[\\/]apache[\\/]hadoop[\\/]fs[\\/]azurebfs[\\/]ITestAzureBlobFileSystemDelete.java"/>
+    <suppress checks="MagicNumber"
+              files="org[\\/]apache[\\/]hadoop[\\/]fs[\\/]azurebfs[\\/]ITestAzureBlobFileSystemRename.java"/>
 </suppressions>
diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/RenameAtomicity.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/RenameAtomicity.java
index 31521e0ca671e..e3a153e6980f2 100644
--- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/RenameAtomicity.java
+++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/RenameAtomicity.java
@@ -228,9 +228,10 @@ void createRenamePendingJson(Path path, byte[] bytes)
         abfsClient.append(path.toUri().getPath(), bytes,
                 appendRequestParameters, null, null, tracingContext);
 
-        List<String> blockIdList = new ArrayList<>(Collections.singleton(blockId));
+//        List<String> blockIdList = new ArrayList<>(Collections.singleton(blockId));
+//        String blockList = generateBlockListXml(blockIdList);
         // PutBlockList on the path.
-        String blockList = ""; //generateBlockListXml(blockIdList);
+        String blockList = "";
         abfsClient.flush(blockList.getBytes(StandardCharsets.UTF_8),
                 path.toUri().getPath(), true, null, null, eTag, null, tracingContext);
     }
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemRename.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemRename.java
index 76e74d1f82c18..3c04db99cdb1e 100644
--- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemRename.java
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemRename.java
@@ -1114,8 +1114,8 @@ public void testParallelRenameForAtomicRenameShouldFail() throws Exception {
         fs.rename(src, dst);
       } catch (Exception e) {
         if (e.getCause() instanceof AbfsLease.LeaseException
-                && e.getCause().getCause() instanceof AbfsRestOperationException &&
-                ((AbfsRestOperationException) e.getCause()
+                && e.getCause().getCause() instanceof AbfsRestOperationException
+                && ((AbfsRestOperationException) e.getCause()
                         .getCause()).getStatusCode() == HTTP_CONFLICT) {
           exceptionOnParallelRename.set(true);
         }
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/RenameAtomicityTestUtils.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/RenameAtomicityTestUtils.java
index 97635a563fc0f..c6792a3aac6f7 100644
--- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/RenameAtomicityTestUtils.java
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/RenameAtomicityTestUtils.java
@@ -27,7 +27,7 @@
 
 public class RenameAtomicityTestUtils {
 
-    public RenameAtomicityTestUtils() {
+    private RenameAtomicityTestUtils() {
     }
 
     /**