diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index df7a4104d22..484d5ee3923 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -230,6 +230,9 @@ Branch-2 ( Unreleased changes )
 
     MAPREDUCE-4441. Fix build issue caused by MR-3451 (kkambatl via tucu)
 
+    HADOOP-8499. Lower min.user.id to 500 for the tests.
+    (Colin Patrick McCabe via eli)
+
 Release 2.0.0-alpha - 05-23-2012
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/test/test-container-executor.c b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/test/test-container-executor.c
index 07a343c69f3..6d7e154a72f 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/test/test-container-executor.c
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/test/test-container-executor.c
@@ -97,7 +97,7 @@ int write_config_file(char *file_name) {
     return EXIT_FAILURE;
   }
   fprintf(file, "banned.users=bannedUser\n");
-  fprintf(file, "min.user.id=1000\n");
+  fprintf(file, "min.user.id=500\n");
   fclose(file);
   return 0;
 }