diff --git a/src/lib-sieve/plugins/metadata/tst-metadata.c b/src/lib-sieve/plugins/metadata/tst-metadata.c
index 6307e0a78cec26700404db90d0d039d00b18404b..76017a90d22e8bfdc0f9fdbf5b8edc458a9038bb 100644
--- a/src/lib-sieve/plugins/metadata/tst-metadata.c
+++ b/src/lib-sieve/plugins/metadata/tst-metadata.c
@@ -378,9 +378,8 @@ static int tst_metadata_operation_execute
 
 	if ( metadata ) {
 		if ( !sieve_mailbox_check_name(str_c(mailbox), &error) ) {
-			sieve_runtime_warning(renv, NULL, "%s test: "
+			sieve_runtime_warning(renv, NULL, "metadata test: "
 				"invalid mailbox name `%s' specified: %s",
-				(metadata ? "metadata" : "servermetadata"),
 				str_sanitize(str_c(mailbox), 256), error);
 			sieve_interpreter_set_test_result(renv->interp, FALSE);
 			return SIEVE_EXEC_OK;
diff --git a/src/lib-sieve/plugins/metadata/tst-metadataexists.c b/src/lib-sieve/plugins/metadata/tst-metadataexists.c
index 7ba5ad0b0b493748c8847207c75fb90f3727878c..65842f79cc616bf82bbaf141c9f352fc9b65a241 100644
--- a/src/lib-sieve/plugins/metadata/tst-metadataexists.c
+++ b/src/lib-sieve/plugins/metadata/tst-metadataexists.c
@@ -364,9 +364,8 @@ static int tst_metadataexists_operation_execute
 	 */
 
 	if ( metadata && !sieve_mailbox_check_name(str_c(mailbox), &error) ) {
-		sieve_runtime_warning(renv, NULL, "%s test: "
+		sieve_runtime_warning(renv, NULL, "metadata test: "
 			"invalid mailbox name `%s' specified: %s",
-			(metadata ? "metadataexists" : "servermetadataexists"),
 			str_sanitize(str_c(mailbox), 256), error);
 		sieve_interpreter_set_test_result(renv->interp, FALSE);
 		return SIEVE_EXEC_OK;