diff --git a/presto-twitter-gateway/src/test/java/com/twitter/presto/gateway/TestStaticClusterManager.java b/presto-twitter-gateway/src/test/java/com/twitter/presto/gateway/TestStaticClusterManager.java
index 1d013a58be31c..167241cdf4f23 100644
--- a/presto-twitter-gateway/src/test/java/com/twitter/presto/gateway/TestStaticClusterManager.java
+++ b/presto-twitter-gateway/src/test/java/com/twitter/presto/gateway/TestStaticClusterManager.java
@@ -121,9 +121,6 @@ public void testQuery()
         sleepUninterruptibly(10, SECONDS);
         assertEquals(clusterStatusTracker.getAllQueryInfos().size(), NUM_QUERIES);
         assertQueryState();
-        while (true) {
-            Thread.sleep(10000);
-        }
     }
 
     private void assertQueryState()
@@ -147,7 +144,7 @@ private void assertQueryState()
                 total += count;
             }
         }
-       assertEquals(total, NUM_QUERIES);
+        assertEquals(total, NUM_QUERIES);
     }
 
     private static TestingPrestoServer createPrestoServer()