diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 88e3db201a3..0bccefb8e6a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1810,6 +1810,9 @@ Release 2.8.0 - UNRELEASED
     HDFS-9549. TestCacheDirectives#testExceedsCapacity is flaky (Xiao Chen via
     cmccabe)
 
+    HDFS-9855. Modify TestAuditLoggerWithCommands to workaround the absence
+    of HDFS-8332 (Kuhu Shukla via kihwal)
+
 Release 2.7.3 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAuditLoggerWithCommands.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAuditLoggerWithCommands.java
index 8b06b0bccd6..1449690fe48 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAuditLoggerWithCommands.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAuditLoggerWithCommands.java
@@ -121,7 +121,6 @@ public void testGetContentSummary() throws IOException {
   public void testSetQuota() throws Exception {
     Path path = new Path("/testdir/testdir1");
     fs.mkdirs(path);
-    fileSys = DFSTestUtil.getFileSystemAs(user1, conf);
     try {
       ((DistributedFileSystem)fileSys).setQuota(path, 10l, 10l);
       fail("The operation should have failed with AccessControlException");
@@ -129,15 +128,17 @@ public void testSetQuota() throws Exception {
     }
     String acePattern =
         ".*allowed=false.*ugi=theDoctor.*cmd=setQuota.*";
-    int length = verifyAuditLogs(acePattern);
-    fileSys.close();
+    verifyAuditLogs(acePattern);
+    String ioePattern =
+        ".*allowed=true.*ugi=" + fs.getFileStatus(path).getOwner().toString() +
+            ".*cmd=delete.*";
+    fs.delete(path, true);
     try {
-      ((DistributedFileSystem)fileSys).setQuota(path, 10l, 10l);
+      ((DistributedFileSystem)fs).setQuota(path, 10l, 10l);
       fail("The operation should have failed with IOException");
     } catch (IOException ace) {
     }
-    assertTrue("Unexpected log from getContentSummary",
-        length == auditlog.getOutput().split("\n").length);
+    verifyAuditLogs(ioePattern);
   }
 
   @Test