diff --git a/docker/demo/hive-batch1.commands b/docker/demo/hive-batch1.commands
index 021c6d55b800d..ed2eaca8aca94 100644
--- a/docker/demo/hive-batch1.commands
+++ b/docker/demo/hive-batch1.commands
@@ -21,16 +21,16 @@ select symbol, max(ts) from stock_ticks_cow group by symbol HAVING symbol = 'GOO
 select symbol, max(ts) from stock_ticks_mor_ro group by symbol HAVING symbol = 'GOOG';
 select symbol, max(ts) from stock_ticks_mor_rt group by symbol HAVING symbol = 'GOOG';
 
-select symbol, ts, volume, open, close  from stock_ticks_cow where  symbol = 'GOOG';
-select symbol, ts, volume, open, close  from stock_ticks_mor_ro where  symbol = 'GOOG';
-select symbol, ts, volume, open, close  from stock_ticks_mor_rt where  symbol = 'GOOG';
+select symbol, ts, volume, open, close  from stock_ticks_cow where  symbol = 'GOOG' order by ts;
+select symbol, ts, volume, open, close  from stock_ticks_mor_ro where  symbol = 'GOOG' order by ts;
+select symbol, ts, volume, open, close  from stock_ticks_mor_rt where  symbol = 'GOOG' order by ts;
 
 select symbol, max(ts) from stock_ticks_cow_bs group by symbol HAVING symbol = 'GOOG';
 select symbol, max(ts) from stock_ticks_mor_bs_ro group by symbol HAVING symbol = 'GOOG';
 select symbol, max(ts) from stock_ticks_mor_bs_rt group by symbol HAVING symbol = 'GOOG';
 
-select symbol, ts, volume, open, close  from stock_ticks_cow_bs where  symbol = 'GOOG';
-select symbol, ts, volume, open, close  from stock_ticks_mor_bs_ro where  symbol = 'GOOG';
-select symbol, ts, volume, open, close  from stock_ticks_mor_bs_rt where  symbol = 'GOOG';
+select symbol, ts, volume, open, close  from stock_ticks_cow_bs where  symbol = 'GOOG' order by ts;
+select symbol, ts, volume, open, close  from stock_ticks_mor_bs_ro where  symbol = 'GOOG' order by ts;
+select symbol, ts, volume, open, close  from stock_ticks_mor_bs_rt where  symbol = 'GOOG' order by ts;
 
 !quit
diff --git a/docker/demo/hive-batch2-after-compaction.commands b/docker/demo/hive-batch2-after-compaction.commands
index 06582a309ae00..9d5a0b27d67d0 100644
--- a/docker/demo/hive-batch2-after-compaction.commands
+++ b/docker/demo/hive-batch2-after-compaction.commands
@@ -20,13 +20,13 @@ add jar ${hudi.hadoop.bundle};
 select symbol, max(ts) from stock_ticks_mor_ro group by symbol HAVING symbol = 'GOOG';
 select symbol, max(ts) from stock_ticks_mor_rt group by symbol HAVING symbol = 'GOOG';
 
-select symbol, ts, volume, open, close  from stock_ticks_mor_ro where  symbol = 'GOOG';
-select symbol, ts, volume, open, close  from stock_ticks_mor_rt where  symbol = 'GOOG';
+select symbol, ts, volume, open, close  from stock_ticks_mor_ro where  symbol = 'GOOG' order by ts;
+select symbol, ts, volume, open, close  from stock_ticks_mor_rt where  symbol = 'GOOG' order by ts;
 
 select symbol, max(ts) from stock_ticks_mor_bs_ro group by symbol HAVING symbol = 'GOOG';
 select symbol, max(ts) from stock_ticks_mor_bs_rt group by symbol HAVING symbol = 'GOOG';
 
-select symbol, ts, volume, open, close  from stock_ticks_mor_bs_ro where  symbol = 'GOOG';
-select symbol, ts, volume, open, close  from stock_ticks_mor_bs_rt where  symbol = 'GOOG';
+select symbol, ts, volume, open, close  from stock_ticks_mor_bs_ro where  symbol = 'GOOG' order by ts;
+select symbol, ts, volume, open, close  from stock_ticks_mor_bs_rt where  symbol = 'GOOG' order by ts;
 
 !quit
diff --git a/hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestHoodieDemo.java b/hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestHoodieDemo.java
index 0fa9b0ffa6206..c8de880bdd91a 100644
--- a/hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestHoodieDemo.java
+++ b/hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestHoodieDemo.java
@@ -24,6 +24,7 @@
 
 import org.apache.hudi.keygen.SimpleKeyGenerator;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
@@ -89,6 +90,17 @@ public class ITTestHoodieDemo extends ITTestBase {
           + " --hoodie-conf hoodie.datasource.hive_sync.database=default "
           + " --hoodie-conf hoodie.datasource.hive_sync.table=%s";
 
+
+  @AfterEach
+  public void clean() throws Exception {
+    String hdfsCmd = "hdfs dfs -rm -R ";
+    List<String> tablePaths = CollectionUtils.createImmutableList(
+        COW_BASE_PATH, MOR_BASE_PATH, COW_BOOTSTRAPPED_BASE_PATH, MOR_BOOTSTRAPPED_BASE_PATH);
+    for (String tablePath : tablePaths) {
+      executeCommandStringInDocker(ADHOC_1_CONTAINER, hdfsCmd + tablePath, true);
+    }
+  }
+
   @Test
   public void testParquetDemo() throws Exception {
     baseFileFormat = HoodieFileFormat.PARQUET;