diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 87c2c3a4d16..0924fce6ab4 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -35,6 +35,9 @@ Release 2.5.0 - UNRELEASED
     YARN-1429. *nix: Allow a way for users to augment classpath of YARN daemons.
     (Jarek Jarcec Cecho via kasha)
 
+    YARN-1833. TestRMAdminService Fails in trunk and branch-2 (Mit Desais via
+    jeagles)
+
   OPTIMIZATIONS
 
   BUG FIXES 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java
index 79e7603e576..ab199d1d39e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java
@@ -377,10 +377,15 @@ public class TestRMAdminService {
     configuration.set(YarnConfiguration.RM_CONFIGURATION_PROVIDER_CLASS,
         "org.apache.hadoop.yarn.FileSystemBasedConfigurationProvider");
 
-    String user = UserGroupInformation.getCurrentUser().getUserName();
-    List<String> groupWithInit =
-        new ArrayList<String>(Groups.getUserToGroupsMappingService(
-            configuration).getGroups(user));
+    String[] defaultTestUserGroups = {"dummy_group1", "dummy_group2"};
+    UserGroupInformation ugi = UserGroupInformation.createUserForTesting
+        ("dummyUser", defaultTestUserGroups);
+
+    String user = ugi.getUserName();
+    List<String> groupWithInit = new ArrayList<String>(2);
+     for(int i = 0; i < ugi.getGroupNames().length; i++ ) {
+       groupWithInit.add(ugi.getGroupNames()[i]);
+     }
 
     // upload default configurations
     uploadDefaultConfiguration();