diff --git a/test/tap/tests/generate_set_session_csv.cpp b/test/tap/tests/generate_set_session_csv.cpp
index c4879d627..9da0f104e 100644
--- a/test/tap/tests/generate_set_session_csv.cpp
+++ b/test/tap/tests/generate_set_session_csv.cpp
@@ -280,6 +280,12 @@ int main() {
 
 	vars["wsrep_osu_method"] = new variable("wsrep_osu_method", true, false, false);
 	add_values_and_quotes("wsrep_osu_method", {"TOI","RSU"});
+
+	vars["sql_require_primary_key"] = new variable("sql_require_primary_key", true, false, true);
+	vars["sql_require_primary_key"]->add(bool_values);
+
+	vars["sql_generate_invisible_primary_key"] = new variable("sql_generate_invisible_primary_key", true, false, true);
+	vars["sql_generate_invisible_primary_key"]->add(bool_values);
 /*
 example:
 "SET sql_mode='NO_ENGINE_SUBSTITUTION', sql_select_limit=3030, session_track_gtids=OWN_GTID; SET max_join_size=10000; ", "{'sql_mode':'NO_ENGINE_SUBSTITUTION','sql_select_limit':'3030', 'max_join_size':'10000', 'session_track_gtids':'OWN_GTID'}"
diff --git a/test/tap/tests/set_testing-240.h b/test/tap/tests/set_testing-240.h
index 867f21224..08242ab6d 100644
--- a/test/tap/tests/set_testing-240.h
+++ b/test/tap/tests/set_testing-240.h
@@ -32,7 +32,9 @@ const std::vector<std::string> possible_unknown_variables = {
 	"wsrep_sync_wait",
 	"max_execution_time",
 	"optimizer_use_condition_selectivity",
-	"max_statement_time"
+	"max_statement_time",
+	"sql_generate_invisible_primary_key",
+	"sql_require_primary_key"
 	};
 
 int readTestCases(const std::string& fileName) {