diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 9c6e8c32e44..c38fbb40689 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -975,6 +975,9 @@ Release 2.0.5-beta - UNRELEASED
 
     HDFS-4784. NPE in FSDirectory.resolvePath(). (Brandon Li via suresh)
 
+    HDFS-4810. several HDFS HA tests have timeouts that are too short. (Chris
+    Nauroth via atm)
+
 Release 2.0.4-alpha - 2013-04-25
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestDFSZKFailoverController.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestDFSZKFailoverController.java
index 98ec33e5d24..ce005b10a14 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestDFSZKFailoverController.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestDFSZKFailoverController.java
@@ -121,7 +121,7 @@ public class TestDFSZKFailoverController extends ClientBaseWithFixes {
    * Test that automatic failover is triggered by shutting the
    * active NN down.
    */
-  @Test(timeout=30000)
+  @Test(timeout=60000)
   public void testFailoverAndBackOnNNShutdown() throws Exception {
     Path p1 = new Path("/dir1");
     Path p2 = new Path("/dir2");
@@ -191,7 +191,7 @@ public class TestDFSZKFailoverController extends ClientBaseWithFixes {
           return false;
         }
       }
-    }, 50, 5000);
+    }, 50, 15000);
   }
 
   /**
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestStandbyCheckpoints.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestStandbyCheckpoints.java
index 2f93cca5dd8..470284b077e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestStandbyCheckpoints.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestStandbyCheckpoints.java
@@ -245,7 +245,7 @@ public class TestStandbyCheckpoints {
    * checkpoint is in progress on the SBN, and therefore the StandbyCheckpointer
    * thread will have FSNS lock. Regression test for HDFS-4591.
    */
-  @Test(timeout=120000)
+  @Test(timeout=300000)
   public void testStandbyExceptionThrownDuringCheckpoint() throws Exception {
     
     // Set it up so that we know when the SBN checkpoint starts and ends.
@@ -256,7 +256,7 @@ public class TestStandbyCheckpoints {
             Mockito.any(Canceler.class));
     
     // Perform some edits and wait for a checkpoint to start on the SBN.
-    doEdits(0, 2000);
+    doEdits(0, 1000);
     nn0.getRpcServer().rollEditLog();
     answerer.waitForCall();
     answerer.proceed();