diff --git a/framework/resources/Functional/hive/hive_optimizations/plan/DRILL_6331_count_into_scan_pushdown_external_table.plan b/framework/resources/Functional/hive/hive_optimizations/plan/DRILL_6331_count_into_scan_pushdown_external_table.plan
index 32036b795..e7a495859 100644
--- a/framework/resources/Functional/hive/hive_optimizations/plan/DRILL_6331_count_into_scan_pushdown_external_table.plan
+++ b/framework/resources/Functional/hive/hive_optimizations/plan/DRILL_6331_count_into_scan_pushdown_external_table.plan
@@ -1,6 +1,3 @@
-Scan
-.*/hive_storage/DRILL_6331/DRILL_6331_external_table/part_col=Partition_one/000000_0
-.*/hive_storage/DRILL_6331/DRILL_6331_external_table_outer_partition/part_col=Partition_three/000000_0
-.*/hive_storage/DRILL_6331/DRILL_6331_external_table/part_col=Partition_two/000000_0
+DirectScan
 numFiles = 3
 DynamicPojoRecordReader.*records.*=.*12
\ No newline at end of file
diff --git a/framework/resources/Functional/hive/hive_optimizations/plan/DRILL_6331_count_into_scan_pushdown_managed_table.plan b/framework/resources/Functional/hive/hive_optimizations/plan/DRILL_6331_count_into_scan_pushdown_managed_table.plan
index d3e6b7b5e..e7a495859 100644
--- a/framework/resources/Functional/hive/hive_optimizations/plan/DRILL_6331_count_into_scan_pushdown_managed_table.plan
+++ b/framework/resources/Functional/hive/hive_optimizations/plan/DRILL_6331_count_into_scan_pushdown_managed_table.plan
@@ -1,6 +1,3 @@
-Scan
-/user/hive/warehouse/drill_6331_managed_table/part_col=Partition_three/000000_0
-/user/hive/warehouse/drill_6331_managed_table/part_col=Partition_two/000000_0
-/user/hive/warehouse/drill_6331_managed_table/part_col=Partition_one/000000_0
+DirectScan
 numFiles = 3
 DynamicPojoRecordReader.*records.*=.*12
\ No newline at end of file