diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 5afca7b8ae8..8b0a92047a3 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -22,8 +22,11 @@ Release 2.9.0 - UNRELEASED
 
   BUG FIXES
 
-  YARN-4109. Exception on RM scheduler page loading with labels. 
-  (Mohammad Shahid Khan via rohithsharmaks)
+    YARN-4109. Exception on RM scheduler page loading with labels. 
+    (Mohammad Shahid Khan via rohithsharmaks)
+
+    YARN-4156. TestAMRestart#testAMBlacklistPreventsRestartOnSameNode 
+    assumes CapacityScheduler. (Anubhav Dhoot via kasha)
 
 Release 2.8.0 - UNRELEASED
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRestart.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRestart.java
index acacc40c4b1..67320391699 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRestart.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRestart.java
@@ -382,6 +382,8 @@ public class TestAMRestart {
   @Test(timeout = 100000)
   public void testAMBlacklistPreventsRestartOnSameNode() throws Exception {
     YarnConfiguration conf = new YarnConfiguration();
+    conf.setClass(YarnConfiguration.RM_SCHEDULER, CapacityScheduler.class,
+        ResourceScheduler.class);
     conf.setBoolean(YarnConfiguration.AM_BLACKLISTING_ENABLED, true);
     testAMBlacklistPreventRestartOnSameNode(false, conf);
   }