diff --git a/tester/liblinphone_tester.c b/tester/liblinphone_tester.c
index 7b5043680..c5d017566 100644
--- a/tester/liblinphone_tester.c
+++ b/tester/liblinphone_tester.c
@@ -197,10 +197,7 @@ int main (int argc, char *argv[])
 		} else if (strcmp(argv[i],"--list-tests")==0){
 			CHECK_ARG("--list-tests", ++i, argc);
 			suite_name = argv[i];
-			for(j=0;j<liblinphone_tester_nb_tests(suite_name);j++) {
-				test_name = liblinphone_tester_test_name(suite_name, j);
-				fprintf(stdout, "%s\n", test_name);
-			}
+			liblinphone_tester_list_suite_tests(suite_name);
 			return 0;
 		} else {
 			fprintf(stderr, "Unknown option \"%s\"\n", argv[i]); \
@@ -217,7 +214,8 @@ int main (int argc, char *argv[])
 		}
 		if(test_name != NULL) {
 			if(liblinphone_tester_test_index(suite_name, test_name) == -1) {
-				fprintf(stderr, "Test \"%s\" not found\n", test_name);
+				fprintf(stderr, "Test \"%s\" not found. Available tests are:\n", test_name);
+				liblinphone_tester_list_suite_tests(suite_name);
 				return -1;
 			}
 		}
diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h
index de781c469..eaadd0ab0 100644
--- a/tester/liblinphone_tester.h
+++ b/tester/liblinphone_tester.h
@@ -63,6 +63,7 @@ extern int liblinphone_tester_nb_test_suites(void);
 extern int liblinphone_tester_nb_tests(const char *suite_name);
 extern const char * liblinphone_tester_test_suite_name(int suite_index);
 extern int liblinphone_tester_test_suite_index(const char *suite_name);
+extern void liblinphone_tester_list_suite_tests(const char *suite_name);
 extern const char * liblinphone_tester_test_name(const char *suite_name, int test_index);
 extern int liblinphone_tester_test_index(const char *suite_name, const char *test_name);
 extern void liblinphone_tester_init(void);
diff --git a/tester/tester.c b/tester/tester.c
index da8552ab5..1cc4acebc 100644
--- a/tester/tester.c
+++ b/tester/tester.c
@@ -288,6 +288,14 @@ int liblinphone_tester_test_suite_index(const char *suite_name) {
 	return -1;
 }
 
+void liblinphone_tester_list_suite_tests(const char *suite_name) {
+	int j;
+	for( j = 0; j < liblinphone_tester_nb_tests(suite_name); j++) {
+		const char *test_name = liblinphone_tester_test_name(suite_name, j);
+		fprintf(stdout, "%s\n", test_name);
+	}
+}
+
 int liblinphone_tester_test_index(const char *suite_name, const char *test_name) {
 	int j,i;