diff --git a/CHANGES.txt b/CHANGES.txt
index 9a6e153bd81..fc566573ec7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -457,6 +457,8 @@ Release 0.92.0 - Unreleased
                TestHCM.testConnectionUniqueness (Jinchao)
    HBASE-4518  TestServerCustomProtocol fails intermittently
    HBASE-4790  Occasional TestDistributedLogSplitting failure (Jinchao)
+   HBASE-4864  TestMasterObserver#testRegionTransitionOperations occasionally
+               fails (Gao Jinchao)
 
   IMPROVEMENTS
    HBASE-3290  Max Compaction Size (Nicolas Spiegelberg via Stack)  
diff --git a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
index c01a6d4741b..1a531572eae 100644
--- a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
+++ b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
@@ -639,7 +639,9 @@ public class TestMasterObserver {
     cp.resetStates();
 
     HTable table = UTIL.createTable(TEST_TABLE, TEST_FAMILY);
-    UTIL.createMultiRegions(table, TEST_FAMILY);
+    int countOfRegions = UTIL.createMultiRegions(table, TEST_FAMILY);
+    UTIL.waitUntilAllRegionsAssigned(countOfRegions);
+    
     NavigableMap<HRegionInfo, ServerName> regions = table.getRegionLocations();
     Map.Entry<HRegionInfo, ServerName> firstGoodPair = null;
     for (Map.Entry<HRegionInfo, ServerName> e: regions.entrySet()) {