diff --git a/CHANGES.txt b/CHANGES.txt
index ffc843c031a..af5956fbb1a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -142,6 +142,8 @@ Release 0.91.0 - Unreleased
                behavior when the field that we are incrementing is less
                than 8 bytes long (Li Pi)
    HBASE-4012  Further optimize byte comparison methods (Ted Yu)
+   HBASE-4037  Add timeout annotations to preempt surefire killing
+               all tests - TestFullLogReconstruction
 
   IMPROVEMENTS
    HBASE-3290  Max Compaction Size (Nicolas Spiegelberg via Stack)  
diff --git a/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java b/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
index 33c3cc43be3..244f9814b34 100644
--- a/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
+++ b/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
@@ -88,7 +88,7 @@ public class TestFullLogReconstruction {
    * see all the rows.
    * @throws Exception
    */
-  @Test
+  @Test (timeout=300000)
   public void testReconstruction() throws Exception {
 
     HTable table = TEST_UTIL.createTable(TABLE_NAME, FAMILY);