diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestFSQueueConverter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestFSQueueConverter.java
index 7d615bbb25..b1cc4a6ccd 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestFSQueueConverter.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/converter/TestFSQueueConverter.java
@@ -344,6 +344,10 @@ public class TestFSQueueConverter {
     assertTrue("root.admins autocreate v2 flag",
         csConfig.getBoolean(
             PREFIX + "root.admins.auto-queue-creation-v2.enabled", false));
+    assertTrue("root.admins.alice autocreate v2 flag",
+        csConfig.getBoolean(
+            PREFIX + "root.admins.alice.auto-queue-creation-v2.enabled",
+                false));
     assertTrue("root.users autocreate v2 flag",
         csConfig.getBoolean(
             PREFIX + "root.users.auto-queue-creation-v2.enabled", false));
@@ -351,13 +355,15 @@ public class TestFSQueueConverter {
         csConfig.getBoolean(
             PREFIX + "root.misc.auto-queue-creation-v2.enabled", false));
 
+    //leaf queue root.admins.alice is removed from the below list
+    //adding reservation to a leaf, it's queueType changes to FSParentQueue
     Set<String> leafs = Sets.difference(ALL_QUEUES,
         Sets.newHashSet("root",
-            "root.default",
             "root.admins",
             "root.users",
-            "root.misc"));
-    assertNoValueForQueues(leafs, "auto-queue-creation-v2.enabled",
+            "root.misc",
+            "root.admins.alice"));
+    assertNoValueForQueues(leafs, ".auto-queue-creation-v2.enabled",
         csConfig);
   }