diff --git a/tester/message_tester.c b/tester/message_tester.c
index c565fb38a..912cdb72c 100644
--- a/tester/message_tester.c
+++ b/tester/message_tester.c
@@ -1706,7 +1706,7 @@ void file_transfer_with_http_proxy(void) {
 
 test_t message_tests[] = {
 	TEST_NO_TAG("Text message", text_message),
-	TEST_ONE_TAG("Text message within call dialog", text_message_within_call_dialog, "MemoryLeaks"),
+	TEST_ONE_TAG("Text message within call dialog", text_message_within_call_dialog, "LeaksMemory"),
 	TEST_NO_TAG("Text message with credentials from auth callback", text_message_with_credential_from_auth_callback),
 	TEST_NO_TAG("Text message with privacy", text_message_with_privacy),
 	TEST_NO_TAG("Text message compatibility mode", text_message_compatibility_mode),
@@ -1717,9 +1717,9 @@ test_t message_tests[] = {
 	TEST_NO_TAG("Transfer message with http proxy", file_transfer_with_http_proxy),
 	TEST_NO_TAG("Transfer message with upload io error", transfer_message_with_upload_io_error),
 	TEST_NO_TAG("Transfer message with download io error", transfer_message_with_download_io_error),
-	TEST_ONE_TAG("Transfer message upload cancelled", transfer_message_upload_cancelled, "MemoryLeaks"),
+	TEST_ONE_TAG("Transfer message upload cancelled", transfer_message_upload_cancelled, "LeaksMemory"),
 	TEST_NO_TAG("Transfer message download cancelled", transfer_message_download_cancelled),
-	TEST_ONE_TAG("Transfer message using external body url", file_transfer_using_external_body_url, "MemoryLeaks"),
+	TEST_ONE_TAG("Transfer message using external body url", file_transfer_using_external_body_url, "LeaksMemory"),
 	TEST_NO_TAG("Transfer 2 messages simultaneously", file_transfer_2_messages_simultaneously),
 	TEST_NO_TAG("Text message denied", text_message_denied),
 	TEST_NO_TAG("Info message", info_message),
@@ -1738,17 +1738,17 @@ test_t message_tests[] = {
 	TEST_NO_TAG("History count", history_count),
 #endif
 	TEST_NO_TAG("Text status after destroying chat room", text_status_after_destroying_chat_room),
-	TEST_ONE_TAG("Transfer not sent if invalid url", file_transfer_not_sent_if_invalid_url, "MemoryLeaks"),
-	TEST_ONE_TAG("Transfer not sent if host not found", file_transfer_not_sent_if_host_not_found, "MemoryLeaks"),
-	TEST_ONE_TAG("Transfer not sent if url moved permanently", file_transfer_not_sent_if_url_moved_permanently, "MemoryLeaks"),
-	TEST_ONE_TAG("Transfer io error after destroying chatroom", file_transfer_io_error_after_destroying_chatroom, "MemoryLeaks"),
+	TEST_ONE_TAG("Transfer not sent if invalid url", file_transfer_not_sent_if_invalid_url, "LeaksMemory"),
+	TEST_ONE_TAG("Transfer not sent if host not found", file_transfer_not_sent_if_host_not_found, "LeaksMemory"),
+	TEST_ONE_TAG("Transfer not sent if url moved permanently", file_transfer_not_sent_if_url_moved_permanently, "LeaksMemory"),
+	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 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),
 	TEST_NO_TAG("Real Time Text with ice", real_time_text_ice),
-	TEST_ONE_TAG("Real Time Text message compatibility crlf", real_time_text_message_compat_crlf, "MemoryLeaks"),
-	TEST_ONE_TAG("Real Time Text message compatibility lf", real_time_text_message_compat_lf, "MemoryLeaks"),
+	TEST_ONE_TAG("Real Time Text message compatibility crlf", real_time_text_message_compat_crlf, "LeaksMemory"),
+	TEST_ONE_TAG("Real Time Text message compatibility lf", real_time_text_message_compat_lf, "LeaksMemory"),
 	TEST_NO_TAG("Real Time Text message with accented characters", real_time_text_message_accented_chars),
 	TEST_NO_TAG("Real Time Text offer answer with different payload numbers (sender side)", real_time_text_message_different_text_codecs_payload_numbers_sender_side),
 	TEST_NO_TAG("Real Time Text offer answer with different payload numbers (receiver side)", real_time_text_message_different_text_codecs_payload_numbers_receiver_side),
diff --git a/tester/tester.c b/tester/tester.c
index bffa77e76..811b86e46 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -564,6 +564,7 @@ int liblinphone_tester_after_each(void) {
 			// if the test is NOT marked as leaking memory and it actually is, we should make it fail
 			if (!leaks_expected && leaked_objects > 0) {
 				BC_FAIL("This test is leaking memory!");
+				return 1;
 				// and reciprocally
 			} else if (leaks_expected && leaked_objects == 0) {
 				BC_FAIL("This test is not leaking anymore, please remove LeaksMemory tag!");
diff --git a/tester/video_tester.c b/tester/video_tester.c
index 0bd3239b4..290782e08 100644
--- a/tester/video_tester.c
+++ b/tester/video_tester.c
@@ -553,7 +553,7 @@ static void enable_disable_camera_after_camera_switches(void) {
 test_t video_tests[] = {
 #if HAVE_GTK
 	TEST_NO_TAG("Early-media video during video call", early_media_video_during_video_call_test),
-	TEST_ONE_TAG("Two incoming early-media video calls", two_incoming_early_media_video_calls_test, "MemoryLeaks"),
+	TEST_ONE_TAG("Two incoming early-media video calls", two_incoming_early_media_video_calls_test, "LeaksMemory"),
 	TEST_NO_TAG("Early-media video with inactive audio", early_media_video_with_inactive_audio),
 	TEST_NO_TAG("Forked outgoing early-media video call with inactive audio", forked_outgoing_early_media_video_call_with_inactive_audio_test),
 #endif /*HAVE_GTK*/