diff --git a/mediastreamer2 b/mediastreamer2
index 394858138..a9e3a9844 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 3948581385b9521c17a54c05c05d613add95e631
+Subproject commit a9e3a984485ef8d22394d06fa75497296daa4c66
diff --git a/oRTP b/oRTP
index 7822737d9..22b81144d 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 7822737d9cce52a956594d9466cb6419595ed7a8
+Subproject commit 22b81144d313b58cfe53c1c9aa71dcf22e1f43c2
diff --git a/tester/call_tester.c b/tester/call_tester.c
index 3dcc2a270..bddffa0b1 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -2230,7 +2230,7 @@ static void call_with_mkv_file_player(void) {
 	/*make sure the record file doesn't already exists, otherwise this test will append new samples to it*/
 	unlink(recordpath);
 
-	snprintf(hellowav,sizeof(hellowav), "%s/sounds/hello8000.wav", liblinphone_tester_file_prefix);
+	snprintf(hellowav,sizeof(hellowav), "%s/sounds/hello8000_mkv_ref.wav", liblinphone_tester_file_prefix);
 	snprintf(hellomkv,sizeof(hellomkv), "%s/sounds/hello8000.mkv", liblinphone_tester_file_prefix);
 
 	/*caller uses files instead of soundcard in order to avoid mixing soundcard input with file played using call's player*/
@@ -3563,19 +3563,24 @@ static void call_with_generic_cn(void) {
 	CU_ASSERT_PTR_NOT_NULL(pauline_call);
 	if (pauline_call){
 		const rtp_stats_t *rtps;
-		struct stat stbuf;
-		int err;
 
 		wait_for_until(marie->lc, pauline->lc, NULL, 0, 8000);
 		rtps=rtp_session_get_stats(pauline_call->audiostream->ms.sessions.rtp_session);
 		CU_ASSERT_TRUE(rtps->packet_recv<=300 && rtps->packet_recv>=200);
+	}
+	end_call(marie,pauline);
+	
+	if (pauline_call){
+		struct stat stbuf;
+		int err;
+		
 		err=stat(recorded_file,&stbuf);
 		CU_ASSERT_EQUAL(err, 0);
 		if (err==0){
 			CU_ASSERT_TRUE(stbuf.st_size>120000);
 		}
 	}
-	end_call(marie,pauline);
+	
 	linphone_core_manager_destroy(marie);
 	linphone_core_manager_destroy(pauline);
 
diff --git a/tester/sounds/hello8000_mkv_ref.wav b/tester/sounds/hello8000_mkv_ref.wav
new file mode 100644
index 000000000..f91203cd8
Binary files /dev/null and b/tester/sounds/hello8000_mkv_ref.wav differ