diff --git a/test/rest_request_template/travis_correct_schema_evolution_w_auto_table_creation_avro_sr.json b/test/rest_request_template/travis_correct_schema_evolution_w_auto_table_creation_avro_sr.json
index 6232e0237..ddea359aa 100644
--- a/test/rest_request_template/travis_correct_schema_evolution_w_auto_table_creation_avro_sr.json
+++ b/test/rest_request_template/travis_correct_schema_evolution_w_auto_table_creation_avro_sr.json
@@ -5,7 +5,7 @@
     "topics": "SNOWFLAKE_TEST_TOPIC0,SNOWFLAKE_TEST_TOPIC1",
     "snowflake.topic2table.map": "SNOWFLAKE_TEST_TOPIC0:SNOWFLAKE_CONNECTOR_NAME,SNOWFLAKE_TEST_TOPIC1:SNOWFLAKE_CONNECTOR_NAME",
     "tasks.max": "1",
-    "buffer.flush.time": "10",
+    "buffer.flush.time": "60",
     "buffer.count.records": "300",
     "buffer.size.bytes": "5000000",
     "snowflake.url.name": "SNOWFLAKE_HOST",
diff --git a/test/rest_request_template/travis_correct_schema_evolution_w_auto_table_creation_json.json b/test/rest_request_template/travis_correct_schema_evolution_w_auto_table_creation_json.json
index e06328050..a51854566 100644
--- a/test/rest_request_template/travis_correct_schema_evolution_w_auto_table_creation_json.json
+++ b/test/rest_request_template/travis_correct_schema_evolution_w_auto_table_creation_json.json
@@ -5,7 +5,7 @@
     "topics": "SNOWFLAKE_TEST_TOPIC0,SNOWFLAKE_TEST_TOPIC1",
     "snowflake.topic2table.map": "SNOWFLAKE_TEST_TOPIC0:SNOWFLAKE_CONNECTOR_NAME,SNOWFLAKE_TEST_TOPIC1:SNOWFLAKE_CONNECTOR_NAME",
     "tasks.max": "1",
-    "buffer.flush.time": "10",
+    "buffer.flush.time": "60",
     "buffer.count.records": "300",
     "buffer.size.bytes": "5000000",
     "snowflake.url.name": "SNOWFLAKE_HOST",
diff --git a/test/test_suit/test_schema_evolution_w_auto_table_creation_avro_sr.py b/test/test_suit/test_schema_evolution_w_auto_table_creation_avro_sr.py
index b95192633..91317160d 100644
--- a/test/test_suit/test_schema_evolution_w_auto_table_creation_avro_sr.py
+++ b/test/test_suit/test_schema_evolution_w_auto_table_creation_avro_sr.py
@@ -89,16 +89,12 @@ def send(self):
                 value.append(self.records[i])
             self.driver.sendAvroSRData(topic, value, self.valueSchema[i], key=[], key_schema="", partition=0)
 
-            sleep(2)
-
             # send second batch that should flush
             value = []
             for _ in range(self.flushRecordCount):
                 value.append(self.records[i])
             self.driver.sendAvroSRData(topic, value, self.valueSchema[i], key=[], key_schema="", partition=0)
 
-            sleep(10) # sleep to ensure all data is flushed
-
     def verify(self, round):
         rows = self.driver.snowflake_conn.cursor().execute(
             "desc table {}".format(self.table)).fetchall()
diff --git a/test/test_suit/test_schema_evolution_w_auto_table_creation_json.py b/test/test_suit/test_schema_evolution_w_auto_table_creation_json.py
index cc0fbf453..e5d3a7157 100644
--- a/test/test_suit/test_schema_evolution_w_auto_table_creation_json.py
+++ b/test/test_suit/test_schema_evolution_w_auto_table_creation_json.py
@@ -61,8 +61,6 @@ def send(self):
                 value.append(json.dumps(self.records[i]).encode('utf-8'))
             self.driver.sendBytesData(topic, value, key)
 
-            sleep(2)
-
             # send second batch that should flush
             key = []
             value = []
@@ -71,9 +69,8 @@ def send(self):
                 value.append(json.dumps(self.records[i]).encode('utf-8'))
             self.driver.sendBytesData(topic, value, key)
 
-            sleep(10) # sleep to ensure all data is flushed
-
     def verify(self, round):
+        sleep(60)
         rows = self.driver.snowflake_conn.cursor().execute(
             "desc table {}".format(self.table)).fetchall()
         res_col = {}