diff --git a/fe/src/test/resources/mysql-hive-site.xml.template b/fe/src/test/resources/mysql-hive-site.xml.template
index 748fb5e62..a8c4f439e 100644
--- a/fe/src/test/resources/mysql-hive-site.xml.template
+++ b/fe/src/test/resources/mysql-hive-site.xml.template
@@ -56,6 +56,10 @@
   <name>datanucleus.metadata.validate</name>
   <value>false</value>
 </property>
+<property>
+  <name>hive.stats.autogather</name>
+  <value>false</value>
+</property>
 <property>
   <name>hive.stats.dbclass</name>
   <value>jdbc:mysql</value>
diff --git a/fe/src/test/resources/postgresql-hive-site.xml.template b/fe/src/test/resources/postgresql-hive-site.xml.template
index 5f39cab5d..2212d4493 100644
--- a/fe/src/test/resources/postgresql-hive-site.xml.template
+++ b/fe/src/test/resources/postgresql-hive-site.xml.template
@@ -56,6 +56,10 @@
   <name>datanucleus.metadata.validate</name>
   <value>false</value>
 </property>
+<property>
+  <name>hive.stats.autogather</name>
+  <value>false</value>
+</property>
 <property>
   <name>hive.stats.dbclass</name>
   <value>jdbc:postgresql</value>
diff --git a/testdata/workloads/functional-planner/queries/PlannerTest/insert.test b/testdata/workloads/functional-planner/queries/PlannerTest/insert.test
index bf98cc702..69426b12a 100644
--- a/testdata/workloads/functional-planner/queries/PlannerTest/insert.test
+++ b/testdata/workloads/functional-planner/queries/PlannerTest/insert.test
@@ -94,28 +94,27 @@ WRITE TO HDFS [functional.alltypessmall, OVERWRITE=false, PARTITION-KEYS=(year,m
 ====
 # insert into fully dynamic partitions. The source table has no stats and the insert
 # statement has a partition clause, so hash partition before the sink.
-# TODO: This test is temporarily disabled due to CDH-19856.
-#insert into table functional.alltypessmall
-#partition (year, month)
-#select id, bool_col, tinyint_col, smallint_col, int_col, bigint_col,
-#float_col, double_col, date_string_col, string_col, timestamp_col, year, month
-#from functional_seq_snap.alltypes
-#where year=2009 and month>10
-#---- PLAN
-#WRITE TO HDFS [functional.alltypessmall, OVERWRITE=false, PARTITION-KEYS=(year,month)]
-#|  partitions=24
-#|
-#00:SCAN HDFS [functional_seq_snap.alltypes]
-#   partitions=2/24 size=11.34KB
-#---- DISTRIBUTEDPLAN
-#WRITE TO HDFS [functional.alltypessmall, OVERWRITE=false, PARTITION-KEYS=(year,month)]
-#|  partitions=24
-#|
-#01:EXCHANGE [HASH(year,month)]
-#|
-#00:SCAN HDFS [functional_seq_snap.alltypes]
-#   partitions=2/24 size=11.34KB
-#====
+insert into table functional.alltypessmall
+partition (year, month)
+select id, bool_col, tinyint_col, smallint_col, int_col, bigint_col,
+float_col, double_col, date_string_col, string_col, timestamp_col, int_col, int_col
+from functional_seq_snap.alltypes
+where year=2009 and month>10
+---- PLAN
+WRITE TO HDFS [functional.alltypessmall, OVERWRITE=false, PARTITION-KEYS=(int_col,int_col)]
+|  partitions=unavailable
+|
+00:SCAN HDFS [functional_seq_snap.alltypes]
+   partitions=2/24 size=11.34KB
+---- DISTRIBUTEDPLAN
+WRITE TO HDFS [functional.alltypessmall, OVERWRITE=false, PARTITION-KEYS=(int_col,int_col)]
+|  partitions=unavailable
+|
+01:EXCHANGE [HASH(int_col,int_col)]
+|
+00:SCAN HDFS [functional_seq_snap.alltypes]
+   partitions=2/24 size=11.34KB
+====
 # insert into fully dynamic partitions;
 # partitioned output doesn't require repartitioning
 insert into table functional.alltypessmall
diff --git a/testdata/workloads/functional-query/queries/QueryTest/show-stats.test b/testdata/workloads/functional-query/queries/QueryTest/show-stats.test
index ab92ea391..4ae9d5996 100644
--- a/testdata/workloads/functional-query/queries/QueryTest/show-stats.test
+++ b/testdata/workloads/functional-query/queries/QueryTest/show-stats.test
@@ -86,10 +86,10 @@ show table stats alltypesmixedformat
 ---- LABELS
 YEAR, MONTH, #ROWS, #FILES, SIZE, BYTES CACHED, FORMAT
 ---- RESULTS
-2009,1,310,1,'19.59KB','NOT CACHED','TEXT'
-2009,2,0,1,'21.35KB','NOT CACHED','SEQUENCE_FILE'
-2009,3,0,1,'17.42KB','NOT CACHED','RC_FILE'
-Total,,310,3,'58.36KB','0B',''
+2009,1,-1,1,'19.59KB','NOT CACHED','TEXT'
+2009,2,-1,1,'21.35KB','NOT CACHED','SEQUENCE_FILE'
+2009,3,-1,1,'17.42KB','NOT CACHED','RC_FILE'
+Total,,-1,3,'58.36KB','0B',''
 ---- TYPES
 INT, INT, BIGINT, BIGINT, STRING, STRING, STRING
 ====