diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServerLifecycle.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServerLifecycle.java
index 2fb51ead9d4..de290e3f1b5 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServerLifecycle.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServerLifecycle.java
@@ -46,12 +46,14 @@ public class TestHttpServerLifecycle extends HttpServerFunctionalTest {
    *
    * @throws Throwable on failure
    */
-  @Test public void testCreatedServerIsNotAlive() throws Throwable {
+  @Test(timeout=60000)
+  public void testCreatedServerIsNotAlive() throws Throwable {
     HttpServer server = createTestServer();
     assertNotLive(server);
   }
 
-  @Test public void testStopUnstartedServer() throws Throwable {
+  @Test(timeout=60000)
+  public void testStopUnstartedServer() throws Throwable {
     HttpServer server = createTestServer();
     stop(server);
   }
@@ -61,7 +63,7 @@ public class TestHttpServerLifecycle extends HttpServerFunctionalTest {
    *
    * @throws Throwable on failure
    */
-  @Test
+  @Test(timeout=60000)
   public void testStartedServerIsAlive() throws Throwable {
     HttpServer server = null;
     server = createTestServer();
@@ -87,7 +89,8 @@ public class TestHttpServerLifecycle extends HttpServerFunctionalTest {
    *
    * @throws Throwable on failure
    */
-  @Test public void testStoppedServerIsNotAlive() throws Throwable {
+  @Test(timeout=60000)
+  public void testStoppedServerIsNotAlive() throws Throwable {
     HttpServer server = createAndStartTestServer();
     assertAlive(server);
     stop(server);
@@ -99,7 +102,8 @@ public class TestHttpServerLifecycle extends HttpServerFunctionalTest {
    *
    * @throws Throwable on failure
    */
-  @Test public void testStoppingTwiceServerIsAllowed() throws Throwable {
+  @Test(timeout=60000)
+  public void testStoppingTwiceServerIsAllowed() throws Throwable {
     HttpServer server = createAndStartTestServer();
     assertAlive(server);
     stop(server);
@@ -110,11 +114,11 @@ public class TestHttpServerLifecycle extends HttpServerFunctionalTest {
 
   /**
    * Test that the server is alive once started
-   * 
+   *
    * @throws Throwable
    *           on failure
    */
-  @Test
+  @Test(timeout=60000)
   public void testWepAppContextAfterServerStop() throws Throwable {
     HttpServer server = null;
     String key = "test.attribute.key";