diff --git a/tester/message_tester.c b/tester/message_tester.c
index d9da01a43..13bc8c933 100644
--- a/tester/message_tester.c
+++ b/tester/message_tester.c
@@ -1333,7 +1333,8 @@ static void file_transfer_io_error_after_destroying_chatroom(void) {
 	file_transfer_io_error_base("https://www.linphone.org:444/lft.php", TRUE);
 }
 
-static void real_time_text(bool_t audio_stream_enabled, bool_t srtp_enabled, bool_t mess_with_marie_payload_number, bool_t mess_with_pauline_payload_number, bool_t ice_enabled, bool_t sql_storage) {
+static void real_time_text(bool_t audio_stream_enabled, bool_t srtp_enabled, bool_t mess_with_marie_payload_number, bool_t mess_with_pauline_payload_number, 
+						   bool_t ice_enabled, bool_t sql_storage, bool_t do_not_store_rtt_messages_in_sql_storage) {
 	LinphoneChatRoom *pauline_chat_room;
 	LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
 	LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc");
@@ -1345,6 +1346,10 @@ static void real_time_text(bool_t audio_stream_enabled, bool_t srtp_enabled, boo
 	if (sql_storage) {
 		linphone_core_set_chat_database_path(marie->lc, marie_db);
 		linphone_core_set_chat_database_path(pauline->lc, pauline_db);
+		if (do_not_store_rtt_messages_in_sql_storage) {
+			lp_config_set_int(marie->lc->config, "misc", "store_rtt_messages", 0);
+			lp_config_set_int(pauline->lc->config, "misc", "store_rtt_messages", 0);
+		}
 	}
 
 	if (mess_with_marie_payload_number) {
@@ -1416,14 +1421,19 @@ static void real_time_text(bool_t audio_stream_enabled, bool_t srtp_enabled, boo
 			if (sql_storage) {
 				MSList *marie_messages = linphone_chat_room_get_history(marie_chat_room, 0);
 				MSList *pauline_messages = linphone_chat_room_get_history(pauline_chat_room, 0);
-				LinphoneChatMessage *marie_msg = (LinphoneChatMessage *)marie_messages->data;
-				LinphoneChatMessage *pauline_msg = (LinphoneChatMessage *)pauline_messages->data;
-				BC_ASSERT_EQUAL(ms_list_size(marie_messages), 1, int , "%i");
-				BC_ASSERT_EQUAL(ms_list_size(pauline_messages), 1, int , "%i");
-				BC_ASSERT_STRING_EQUAL(marie_msg->message, message);
-				BC_ASSERT_STRING_EQUAL(pauline_msg->message, message);
-				ms_list_free_with_data(marie_messages, (void (*)(void *))linphone_chat_message_unref);
-				ms_list_free_with_data(pauline_messages, (void (*)(void *))linphone_chat_message_unref);
+				if (do_not_store_rtt_messages_in_sql_storage) {
+					BC_ASSERT_EQUAL(ms_list_size(marie_messages), 0, int , "%i");
+					BC_ASSERT_EQUAL(ms_list_size(pauline_messages), 0, int , "%i");
+				} else {
+					LinphoneChatMessage *marie_msg = (LinphoneChatMessage *)marie_messages->data;
+					LinphoneChatMessage *pauline_msg = (LinphoneChatMessage *)pauline_messages->data;
+					BC_ASSERT_EQUAL(ms_list_size(marie_messages), 1, int , "%i");
+					BC_ASSERT_EQUAL(ms_list_size(pauline_messages), 1, int , "%i");
+					BC_ASSERT_STRING_EQUAL(marie_msg->message, message);
+					BC_ASSERT_STRING_EQUAL(pauline_msg->message, message);
+					ms_list_free_with_data(marie_messages, (void (*)(void *))linphone_chat_message_unref);
+					ms_list_free_with_data(pauline_messages, (void (*)(void *))linphone_chat_message_unref);
+				}
 			}
 		}
 
@@ -1450,11 +1460,15 @@ static void real_time_text(bool_t audio_stream_enabled, bool_t srtp_enabled, boo
 }
 
 static void real_time_text_message(void) {
-	real_time_text(TRUE, FALSE, FALSE, FALSE, FALSE, FALSE);
+	real_time_text(TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE);
 }
 
 static void real_time_text_sql_storage(void) {
-	real_time_text(TRUE, FALSE, FALSE, FALSE, FALSE, TRUE);
+	real_time_text(TRUE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE);
+}
+
+static void real_time_text_sql_storage_rtt_disabled(void) {
+	real_time_text(TRUE, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE);
 }
 
 static void real_time_text_conversation(void) {
@@ -1557,15 +1571,15 @@ static void real_time_text_conversation(void) {
 }
 
 static void real_time_text_without_audio(void) {
-	real_time_text(FALSE, FALSE, FALSE, FALSE, FALSE, FALSE);
+	real_time_text(FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE);
 }
 
 static void real_time_text_srtp(void) {
-	real_time_text(TRUE, TRUE, FALSE, FALSE, FALSE, FALSE);
+	real_time_text(TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE);
 }
 
 static void real_time_text_ice(void) {
-	real_time_text(TRUE, FALSE, FALSE, FALSE, TRUE, FALSE);
+	real_time_text(TRUE, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE);
 }
 
 static void real_time_text_message_compat(bool_t end_with_crlf, bool_t end_with_lf) {
@@ -1674,11 +1688,11 @@ static void real_time_text_message_accented_chars(void) {
 }
 
 static void real_time_text_message_different_text_codecs_payload_numbers_sender_side(void) {
-	real_time_text(FALSE, FALSE, TRUE, FALSE, FALSE, FALSE);
+	real_time_text(FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE);
 }
 
 static void real_time_text_message_different_text_codecs_payload_numbers_receiver_side(void) {
-	real_time_text(FALSE, FALSE, FALSE, TRUE, FALSE, FALSE);
+	real_time_text(FALSE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE);
 }
 
 static void real_time_text_copy_paste(void) {
@@ -1777,6 +1791,7 @@ test_t message_tests[] = {
 	TEST_ONE_TAG("Transfer io error after destroying chatroom", file_transfer_io_error_after_destroying_chatroom, "LeaksMemory"),
 	TEST_NO_TAG("Real Time Text message", real_time_text_message),
 	TEST_NO_TAG("Real Time Text SQL storage", real_time_text_sql_storage),
+	TEST_NO_TAG("Real Time Text SQL storage with RTT messages not stored", real_time_text_sql_storage_rtt_disabled),
 	TEST_NO_TAG("Real Time Text conversation", real_time_text_conversation),
 	TEST_NO_TAG("Real Time Text without audio", real_time_text_without_audio),
 	TEST_NO_TAG("Real Time Text with srtp", real_time_text_srtp),