diff --git a/framework/resources/Functional/query_parser/DRILL-6974_alter_session_set_command_works.e_tsv b/framework/resources/Functional/query_parser/DRILL-6974_alter_session_set_command_works.e_tsv
new file mode 100644
index 000000000..3987d3921
--- /dev/null
+++ b/framework/resources/Functional/query_parser/DRILL-6974_alter_session_set_command_works.e_tsv
@@ -0,0 +1 @@
+store.kafka.poll.timeout	201
\ No newline at end of file
diff --git a/framework/resources/Functional/query_parser/DRILL-6974_alter_session_set_command_works.sql b/framework/resources/Functional/query_parser/DRILL-6974_alter_session_set_command_works.sql
new file mode 100644
index 000000000..e189920cd
--- /dev/null
+++ b/framework/resources/Functional/query_parser/DRILL-6974_alter_session_set_command_works.sql
@@ -0,0 +1,3 @@
+set  store.kafka.poll.timeout = 201;
+alter session set store.kafka.poll.timeout;
+reset store.kafka.poll.timeout;
\ No newline at end of file
diff --git a/framework/resources/Functional/query_parser/DRILL-6974_set_property_can_be_updated.e_tsv b/framework/resources/Functional/query_parser/DRILL-6974_set_property_can_be_updated.e_tsv
new file mode 100644
index 000000000..a61e28352
--- /dev/null
+++ b/framework/resources/Functional/query_parser/DRILL-6974_set_property_can_be_updated.e_tsv
@@ -0,0 +1 @@
+exec.enable_union_type	true
\ No newline at end of file
diff --git a/framework/resources/Functional/query_parser/DRILL-6974_set_property_can_be_updated.sql b/framework/resources/Functional/query_parser/DRILL-6974_set_property_can_be_updated.sql
new file mode 100644
index 000000000..4f789d6f0
--- /dev/null
+++ b/framework/resources/Functional/query_parser/DRILL-6974_set_property_can_be_updated.sql
@@ -0,0 +1,3 @@
+set exec.enable_union_type = true;
+set exec.enable_union_type;
+reset exec.enable_union_type;
\ No newline at end of file
diff --git a/framework/resources/Functional/query_parser/DRILL-6974_set_returns_current_value_of_property.e_tsv b/framework/resources/Functional/query_parser/DRILL-6974_set_returns_current_value_of_property.e_tsv
new file mode 100644
index 000000000..2a28ba168
--- /dev/null
+++ b/framework/resources/Functional/query_parser/DRILL-6974_set_returns_current_value_of_property.e_tsv
@@ -0,0 +1 @@
+store.format	parquet
\ No newline at end of file
diff --git a/framework/resources/Functional/query_parser/DRILL-6974_set_returns_current_value_of_property.sql b/framework/resources/Functional/query_parser/DRILL-6974_set_returns_current_value_of_property.sql
new file mode 100644
index 000000000..1fa9e1ee4
--- /dev/null
+++ b/framework/resources/Functional/query_parser/DRILL-6974_set_returns_current_value_of_property.sql
@@ -0,0 +1,3 @@
+set `store.format`='json';
+alter system set `store.format`;
+reset `store.format`;
\ No newline at end of file