diff --git a/src/test-client.c b/src/test-client.c
index 2ff337e..5ae3501 100644
--- a/src/test-client.c
+++ b/src/test-client.c
@@ -175,8 +175,8 @@
 		if (strlen(line) > 0) {
 			json_object_object_add(msg, "source", json_object_new_string(line));
 		} else {
-			printf("Configuration data: ");
-			getline (&line, &len, stdin);
+			printf("Configuration data (ending with CTRL+D): ");
+			getdelim (&line, &len, 'D' - 0x40, stdin);
 			line[(strlen(line)-1)] = 0;
 			json_object_object_add(msg, "config", json_object_new_string(line));
 		}
@@ -224,8 +224,8 @@
 		if (strlen(line) > 0) {
 			json_object_object_add(msg, "error-option", json_object_new_string(line));
 		}
-		printf("Configuration data: ");
-		getline(&line, &len, stdin);
+		printf("Configuration data (ending with CTRL+D): ");
+		getdelim(&line, &len, 'D' - 0x40, stdin);
 		line[(strlen(line) - 1)] = 0;
 		json_object_object_add(msg, "config", json_object_new_string(line));
 	} else if (strcmp(argv[1], "get") == 0) {