diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BackwardCompatibilityIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BackwardCompatibilityIT.java
index 809fde47829..ab08cecc8d0 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BackwardCompatibilityIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BackwardCompatibilityIT.java
@@ -109,6 +109,10 @@ public static synchronized Collection<MavenCoordinates> data() throws Exception
     public synchronized void doSetup() throws Exception {
         tmpDir = System.getProperty("java.io.tmpdir");
         conf = HBaseConfiguration.create();
+        conf.set(QueryServices.TASK_HANDLING_INTERVAL_MS_ATTRIB,
+            Long.toString(Long.MAX_VALUE));
+        conf.set(QueryServices.TASK_HANDLING_INITIAL_DELAY_MS_ATTRIB,
+            Long.toString(Long.MAX_VALUE));
         hbaseTestUtil = new HBaseTestingUtility(conf);
         setUpConfigForMiniCluster(conf);
         conf.set(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
@@ -389,11 +393,11 @@ public void testSystemTaskCreationWithIndexAsyncRebuild() throws Exception {
         if (majorVersion > 4 || (majorVersion == 4 && minorVersion >= 15)) {
             executeQueryWithClientVersion(compatibleClientVersion,
                 INDEX_REBUILD_ASYNC, zkQuorum);
-            // wait to finish the rebuild job (convoluted logic to preserve the AssertionError)
+            //Check if the task is added.
+            //It won't start because we set the task intervals to long.MAX_VALUE
             int retryCount=0;
             while (true) {
                 try {
-                    Thread.sleep(5000);
                     executeQueriesWithCurrentVersion(QUERY_INDEX_REBUILD_ASYNC, url, NONE);
                     assertExpectedOutput(QUERY_INDEX_REBUILD_ASYNC);
                     break;
@@ -401,6 +405,7 @@ public void testSystemTaskCreationWithIndexAsyncRebuild() throws Exception {
                     if (retryCount++ > 10) {
                         throw e;
                     }
+                    Thread.sleep(5000);
                 }
             }
         }
diff --git a/phoenix-core/src/it/resources/gold_files/gold_query_index_rebuild_async.txt b/phoenix-core/src/it/resources/gold_files/gold_query_index_rebuild_async.txt
index ff020c532b9..4f96ce067b2 100644
--- a/phoenix-core/src/it/resources/gold_files/gold_query_index_rebuild_async.txt
+++ b/phoenix-core/src/it/resources/gold_files/gold_query_index_rebuild_async.txt
@@ -17,7 +17,7 @@
  */
 
 'TASK_TYPE','TABLE_NAME','TASK_STATUS','TASK_PRIORITY'
-'2','TI','COMPLETED','4'
+'2','TI','CREATED','4'
 'K','V'
 'key1','val2'
 'key3','val3'