diff --git a/tester/liblinphone_tester.c b/tester/liblinphone_tester.c
index 684654e88..bbd1052bf 100644
--- a/tester/liblinphone_tester.c
+++ b/tester/liblinphone_tester.c
@@ -229,6 +229,8 @@ int main (int argc, char *argv[])
 			liblinphone_tester_keep_recorded_files(TRUE);
 		} else if (strcmp(argv[i],"--disable-leak-detector")==0){
 			liblinphone_tester_disable_leak_detector(TRUE);
+		} else if (strcmp(argv[i],"--6")==0){
+			liblinphonetester_ipv6=TRUE;
 		} else {
 			int bret = bc_tester_parse_args(argc, argv, i);
 			if (bret>0) {
diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h
index 9718e3b1b..221df54a2 100644
--- a/tester/liblinphone_tester.h
+++ b/tester/liblinphone_tester.h
@@ -106,7 +106,7 @@ extern const char* test_username;
 extern const char* test_password;
 extern const char* test_route;
 extern const char* userhostsfile;
-
+extern bool_t liblinphonetester_ipv6;
 
 typedef struct _stats {
 	int number_of_LinphoneRegistrationNone;
diff --git a/tester/tester.c b/tester/tester.c
index 56a4dab12..8d7070d35 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -53,6 +53,7 @@ const char* test_username="liblinphone_tester";
 const char* test_password="secret";
 const char* test_route="sip2.linphone.org";
 const char *userhostsfile = "tester_hosts";
+bool_t liblinphonetester_ipv6 = FALSE;
 
 const char *liblinphone_tester_mire_id="Mire: Mire (synthetic moving picture)";
 
@@ -148,7 +149,9 @@ LinphoneCore* configure_lc_from(LinphoneCoreVTable* v_table, const char* path, c
 		linphone_core_set_ringback(lc, ringbackpath);
 		linphone_core_set_root_ca(lc,rootcapath);
 	}
-
+	
+	linphone_core_enable_ipv6(lc, liblinphonetester_ipv6);
+	
 	sal_enable_test_features(lc->sal,TRUE);
 	sal_set_dns_user_hosts_file(lc->sal, dnsuserhostspath);
 	linphone_core_set_static_picture(lc,nowebcampath);