diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewConcurrencyAndFailureIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewConcurrencyAndFailureIT.java
index 43833079e4c..f69f217f6a3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewConcurrencyAndFailureIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewConcurrencyAndFailureIT.java
@@ -113,7 +113,8 @@ public ViewConcurrencyAndFailureIT(String transactionProvider,
     }
 
     // name is used by failsafe as file name in reports
-    @Parameters(name="ViewIT_transactionProvider={0}, columnEncoded={1}")
+    @Parameters(name="ViewConcurrencyAndFailureIT_transactionProvider={0}, "
+            + "columnEncoded={1}")
     public static synchronized Collection<Object[]> data() {
         return TestUtil.filterTxParamData(Arrays.asList(new Object[][] {
                 { "TEPHRA", false }, { "TEPHRA", true },
@@ -629,7 +630,7 @@ public Thread newThread(Runnable r) {
             Future<Exception> future = executorService.submit(
                     new CreateViewRunnable(fullTableName, fullViewName1));
             // wait till the thread makes the rpc to add the column
-            boolean result = latch1.await(20, TimeUnit.MINUTES);
+            boolean result = latch1.await(2, TimeUnit.MINUTES);
             if (!result) {
                 fail("The create view rpc look too long");
             }
@@ -727,7 +728,7 @@ private void processTable(String tableName)
                     try {
                         // wait till the second task is complete before
                         // completing the first task
-                        boolean result = latch2.await(20, TimeUnit.MINUTES);
+                        boolean result = latch2.await(2, TimeUnit.MINUTES);
                         if (!result) {
                             throw new RuntimeException("Second task took too "
                                     + "long to complete");